diff --git a/jakarta-xmlbind/pom.xml b/jakarta-xmlbind/pom.xml index 11f3dcbd7..6c6da799e 100644 --- a/jakarta-xmlbind/pom.xml +++ b/jakarta-xmlbind/pom.xml @@ -55,9 +55,9 @@ - com.sun.activation - jakarta.activation - 2.0.1 + jakarta.activation + jakarta.activation-api + 2.1.0 diff --git a/jakarta-xmlbind/src/main/java/com/fasterxml/jackson/module/jakarta/xmlbind/JakartaXmlBindAnnotationIntrospector.java b/jakarta-xmlbind/src/main/java/com/fasterxml/jackson/module/jakarta/xmlbind/JakartaXmlBindAnnotationIntrospector.java index adeae788c..ea17e68a7 100644 --- a/jakarta-xmlbind/src/main/java/com/fasterxml/jackson/module/jakarta/xmlbind/JakartaXmlBindAnnotationIntrospector.java +++ b/jakarta-xmlbind/src/main/java/com/fasterxml/jackson/module/jakarta/xmlbind/JakartaXmlBindAnnotationIntrospector.java @@ -717,16 +717,16 @@ public JsonSerializer findSerializer(Annotated am) } /** - * Determines whether the type is assignable to class javax.activation.DataHandler without requiring that class + * Determines whether the type is assignable to class jakarta.activation.DataHandler without requiring that class * to be on the classpath. * * @param type The type. - * @return Whether the type is assignable to class javax.activation.DataHandler + * @return Whether the type is assignable to class jakarta.activation.DataHandler */ private boolean isDataHandler(Class type) { return type != null && (Object.class != type) - && (("javax.activation.DataHandler".equals(type.getName()) || isDataHandler(type.getSuperclass()))); + && (("jakarta.activation.DataHandler".equals(type.getName()) || isDataHandler(type.getSuperclass()))); } @Override diff --git a/jakarta-xmlbind/src/main/java/com/fasterxml/jackson/module/jakarta/xmlbind/deser/DataHandlerDeserializer.java b/jakarta-xmlbind/src/main/java/com/fasterxml/jackson/module/jakarta/xmlbind/deser/DataHandlerDeserializer.java index 974f401ef..ab94d25a4 100644 --- a/jakarta-xmlbind/src/main/java/com/fasterxml/jackson/module/jakarta/xmlbind/deser/DataHandlerDeserializer.java +++ b/jakarta-xmlbind/src/main/java/com/fasterxml/jackson/module/jakarta/xmlbind/deser/DataHandlerDeserializer.java @@ -5,8 +5,8 @@ import java.io.OutputStream; import java.io.ByteArrayInputStream; -import javax.activation.DataHandler; -import javax.activation.DataSource; +import jakarta.activation.DataHandler; +import jakarta.activation.DataSource; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/jakarta-xmlbind/src/main/java/com/fasterxml/jackson/module/jakarta/xmlbind/ser/DataHandlerSerializer.java b/jakarta-xmlbind/src/main/java/com/fasterxml/jackson/module/jakarta/xmlbind/ser/DataHandlerSerializer.java index f4c2c76d7..480cb2f5b 100644 --- a/jakarta-xmlbind/src/main/java/com/fasterxml/jackson/module/jakarta/xmlbind/ser/DataHandlerSerializer.java +++ b/jakarta-xmlbind/src/main/java/com/fasterxml/jackson/module/jakarta/xmlbind/ser/DataHandlerSerializer.java @@ -5,7 +5,7 @@ import java.io.InputStream; import java.lang.reflect.Type; -import javax.activation.DataHandler; +import jakarta.activation.DataHandler; import com.fasterxml.jackson.core.*; import com.fasterxml.jackson.databind.JavaType;