From ac8c2f997ad738444140cce7c4bb39e75f9b0815 Mon Sep 17 00:00:00 2001 From: Chris Kelley Date: Fri, 3 Feb 2023 11:17:49 +0000 Subject: [PATCH] Remove dependency on jakarta-activation1 compat package --- ...tivation-imports-with-jakarta.activa.patch | 66 +++++++++++++++++++ jackson-modules-base.spec | 9 ++- 2 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 0001-Replace-javax.activation-imports-with-jakarta.activa.patch diff --git a/0001-Replace-javax.activation-imports-with-jakarta.activa.patch b/0001-Replace-javax.activation-imports-with-jakarta.activa.patch new file mode 100644 index 0000000..14a68bb --- /dev/null +++ b/0001-Replace-javax.activation-imports-with-jakarta.activa.patch @@ -0,0 +1,66 @@ +From 32bb2ba2eba90ad2fc574e28eacf76895c685015 Mon Sep 17 00:00:00 2001 +From: Chris Kelley +Date: Fri, 3 Feb 2023 10:57:18 +0000 +Subject: [PATCH] Replace javax.activation imports with jakarta.activation + +--- + .../jackson/module/jaxb/JaxbAnnotationIntrospector.java | 6 +++--- + .../module/jaxb/deser/DataHandlerJsonDeserializer.java | 4 ++-- + .../jackson/module/jaxb/ser/DataHandlerJsonSerializer.java | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java +index bf20bb95..908b89e0 100644 +--- a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java ++++ b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java +@@ -728,16 +728,16 @@ public class JaxbAnnotationIntrospector + } + + /** +- * 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/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/deser/DataHandlerJsonDeserializer.java b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/deser/DataHandlerJsonDeserializer.java +index cf09f51e..22fe4641 100644 +--- a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/deser/DataHandlerJsonDeserializer.java ++++ b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/deser/DataHandlerJsonDeserializer.java +@@ -5,8 +5,8 @@ import java.io.InputStream; + 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/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/ser/DataHandlerJsonSerializer.java b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/ser/DataHandlerJsonSerializer.java +index 077a5981..db84231c 100644 +--- a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/ser/DataHandlerJsonSerializer.java ++++ b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/ser/DataHandlerJsonSerializer.java +@@ -5,7 +5,7 @@ import java.io.IOException; + 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; +-- +2.39.0 + diff --git a/jackson-modules-base.spec b/jackson-modules-base.spec index 8eaffb2..03f692d 100644 --- a/jackson-modules-base.spec +++ b/jackson-modules-base.spec @@ -2,13 +2,14 @@ Name: jackson-modules-base Version: 2.14.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Jackson modules: Base License: Apache-2.0 URL: https://github.com/FasterXML/jackson-modules-base Source0: %{url}/archive/%{name}-%{version}.tar.gz Patch1: 0001-Expose-javax.security.auth-from-JDK-internals.patch +Patch2: 0001-Replace-javax.activation-imports-with-jakarta.activa.patch BuildRequires: maven-local BuildRequires: mvn(cglib:cglib) @@ -17,7 +18,7 @@ BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) >= %{version} BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) >= %{version} BuildRequires: mvn(com.fasterxml.jackson:jackson-base:pom:) >= %{version} BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer) -BuildRequires: mvn(jakarta.activation:jakarta.activation-api:1.2.2) +BuildRequires: mvn(jakarta.activation:jakarta.activation-api) BuildRequires: mvn(jakarta.xml.bind:jakarta.xml.bind-api:2.3.3) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -43,6 +44,7 @@ framework to read and write XML. %prep %setup -q -n %{name}-%{name}-%{version} %patch1 -p1 +%patch2 -p1 %pom_remove_dep -r org.glassfish.jaxb:jaxb-runtime %pom_remove_plugin "de.jjohannes:gradle-module-metadata-maven-plugin" @@ -100,6 +102,9 @@ rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.ja %license LICENSE NOTICE %changelog +* Fri Feb 03 2023 Chris Kelley - 2.14.2-2 +- Remove dependency on jakarta-activation1 compat package + * Tue Jan 31 2023 Chris Kelley - 2.14.2-1 - Update to version 2.14.2