Skip to content

Commit f5597ae

Browse files
authored
Merge pull request #177 from jamezp/jakarta-activation-fix-2.13
#175: Migrate to a Jakarta namespaced activation API.
2 parents 9ac463d + c214a55 commit f5597ae

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

jakarta-xmlbind/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555

5656
<!-- 15-Jan-2022, tatu: as per [modules-base#152] -->
5757
<dependency>
58-
<groupId>com.sun.activation</groupId>
59-
<artifactId>jakarta.activation</artifactId>
60-
<version>2.0.1</version>
58+
<groupId>jakarta.activation</groupId>
59+
<artifactId>jakarta.activation-api</artifactId>
60+
<version>2.1.0</version>
6161
</dependency>
6262

6363
<!-- may also need JAXB impl for tests -->

jakarta-xmlbind/src/main/java/com/fasterxml/jackson/module/jakarta/xmlbind/JakartaXmlBindAnnotationIntrospector.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -717,16 +717,16 @@ public JsonSerializer<?> findSerializer(Annotated am)
717717
}
718718

719719
/**
720-
* Determines whether the type is assignable to class javax.activation.DataHandler without requiring that class
720+
* Determines whether the type is assignable to class jakarta.activation.DataHandler without requiring that class
721721
* to be on the classpath.
722722
*
723723
* @param type The type.
724-
* @return Whether the type is assignable to class javax.activation.DataHandler
724+
* @return Whether the type is assignable to class jakarta.activation.DataHandler
725725
*/
726726
private boolean isDataHandler(Class<?> type)
727727
{
728728
return type != null && (Object.class != type)
729-
&& (("javax.activation.DataHandler".equals(type.getName()) || isDataHandler(type.getSuperclass())));
729+
&& (("jakarta.activation.DataHandler".equals(type.getName()) || isDataHandler(type.getSuperclass())));
730730
}
731731

732732
@Override

jakarta-xmlbind/src/main/java/com/fasterxml/jackson/module/jakarta/xmlbind/deser/DataHandlerDeserializer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import java.io.OutputStream;
66
import java.io.ByteArrayInputStream;
77

8-
import javax.activation.DataHandler;
9-
import javax.activation.DataSource;
8+
import jakarta.activation.DataHandler;
9+
import jakarta.activation.DataSource;
1010

1111
import com.fasterxml.jackson.core.JsonParser;
1212
import com.fasterxml.jackson.core.JsonProcessingException;

jakarta-xmlbind/src/main/java/com/fasterxml/jackson/module/jakarta/xmlbind/ser/DataHandlerSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.io.InputStream;
66
import java.lang.reflect.Type;
77

8-
import javax.activation.DataHandler;
8+
import jakarta.activation.DataHandler;
99

1010
import com.fasterxml.jackson.core.*;
1111
import com.fasterxml.jackson.databind.JavaType;

0 commit comments

Comments
 (0)