diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6985d38..0000000 --- a/.gitignore +++ /dev/null @@ -1,21 +0,0 @@ -/results_* -/*.src.rpm - -/jackson-modules-base-2.9.8.tar.gz -/jackson-modules-base-2.10.0.tar.gz -/jackson-modules-base-2.10.1.tar.gz -/jackson-modules-base-2.10.2.tar.gz -/jackson-modules-base-2.10.3.tar.gz -/jackson-modules-base-2.10.4.tar.gz -/jackson-modules-base-2.11.0.tar.gz -/jackson-modules-base-2.11.1.tar.gz -/jackson-modules-base-2.11.2.tar.gz -/jackson-modules-base-2.11.3.tar.gz -/jackson-modules-base-2.11.4.tar.gz -/jackson-modules-base-2.14.0.tar.gz -/jackson-modules-base-2.14.1.tar.gz -/jackson-modules-base-2.14.2.tar.gz -/jackson-modules-base-2.15.2.tar.gz -/jackson-modules-base-2.15.3.tar.gz -/jackson-modules-base-2.16.0.tar.gz -/jackson-modules-base-2.16.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index 587f278..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -downstream_package_name: jackson-modules-base -specfile_path: jackson-modules-base.spec -upstream_package_name: jackson-modules-base -upstream_project_url: https://github.com/FasterXML/jackson-modules-base -upstream_tag_template: jackson-modules-base-{version} - -actions: - post-upstream-clone: - - "wget https://src.fedoraproject.org/rpms/jackson-modules-base/raw/main/f/jackson-modules-base.spec -O jackson-modules-base.spec" - -jobs: -- job: pull_from_upstream - trigger: release - dist_git_branches: - - fedora-development - -# We cannot do koji_build/bodhi_update jobs yet as we need to use -# a side-tag and this is no supported yet. We can add them is this -# issue gets resolved: https://github.com/packit/packit/issues/1870 diff --git a/0001-Expose-javax.security.auth-from-JDK-internals.patch b/0001-Expose-javax.security.auth-from-JDK-internals.patch deleted file mode 100644 index 43fb443..0000000 --- a/0001-Expose-javax.security.auth-from-JDK-internals.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 45cad535d09c0b67719a1ebe14353636515596f7 Mon Sep 17 00:00:00 2001 -From: Chris Kelley -Date: Thu, 8 Sep 2022 12:44:54 +0100 -Subject: [PATCH] Expose javax.security.auth from JDK internals - ---- - pom.xml | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/pom.xml b/pom.xml -index e72b4934..cafe56de 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -97,6 +97,9 @@ not datatype, data format, or JAX-RS provider modules. - - com/fasterxml/jackson/**/failing/*.java - -+ -+ --add-opens=java.base/javax.security.auth=ALL-UNNAMED -+ - - - --- -2.38.1 - diff --git a/0001-Replace-javax.activation-imports-with-jakarta.activa.patch b/0001-Replace-javax.activation-imports-with-jakarta.activa.patch deleted file mode 100644 index 14a68bb..0000000 --- a/0001-Replace-javax.activation-imports-with-jakarta.activa.patch +++ /dev/null @@ -1,66 +0,0 @@ -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/0001-Use-jakarta.activation-namespace-in-jaxb-api.patch b/0001-Use-jakarta.activation-namespace-in-jaxb-api.patch deleted file mode 100644 index ef88dbc..0000000 --- a/0001-Use-jakarta.activation-namespace-in-jaxb-api.patch +++ /dev/null @@ -1,696 +0,0 @@ -From d361f9ad2e658ee6e14ab29685463274faaa57a6 Mon Sep 17 00:00:00 2001 -From: Chris Kelley -Date: Fri, 3 Feb 2023 16:33:42 +0000 -Subject: [PATCH] Use jakarta.activation namespace in jaxb-api - ---- - afterburner/dependency-reduced-pom.xml | 103 ++++++++++++++++++ - .../jackson/module/jaxb/AdapterConverter.java | 2 +- - .../jaxb/JaxbAnnotationIntrospector.java | 16 +-- - .../module/jaxb/adapters/MapAdapter.java | 4 +- - .../jaxb/adapters/TestAdaptedMapType.java | 4 +- - .../module/jaxb/adapters/TestAdapters.java | 14 +-- - .../adapters/TestAdaptersForContainers.java | 4 +- - .../jaxb/adapters/TestIdentityAdapters.java | 4 +- - .../module/jaxb/failing/TestUnwrapping.java | 2 +- - .../module/jaxb/failing/TestXmlID3.java | 4 +- - .../jackson/module/jaxb/id/TestXmlID.java | 2 +- - .../jackson/module/jaxb/id/TestXmlID2.java | 2 +- - .../jaxb/introspect/TestAccessType.java | 6 +- - .../introspect/TestAnnotationPriority.java | 2 +- - .../jaxb/introspect/TestIntrospectorPair.java | 2 +- - .../TestJaxbAnnotationIntrospector.java | 6 +- - .../jaxb/introspect/TestJaxbAutoDetect.java | 2 +- - .../jaxb/introspect/TestJaxbFieldAccess.java | 2 +- - .../jaxb/introspect/TestPropertyOrdering.java | 2 +- - .../introspect/TestPropertyVisibility.java | 2 +- - .../module/jaxb/introspect/TestXmlValue.java | 2 +- - .../module/jaxb/misc/TestElementWrapper.java | 4 +- - .../jackson/module/jaxb/misc/TestEnums.java | 2 +- - .../jaxb/misc/TestJaxbNullProperties.java | 4 +- - .../module/jaxb/misc/TestRootName.java | 2 +- - .../jaxb/misc/TestSchemaGeneration.java | 2 +- - .../jaxb/misc/TestSerializationInclusion.java | 2 +- - .../misc/TestXmlAnyElementWithElementRef.java | 2 +- - .../module/jaxb/misc/package-info.java | 4 +- - .../module/jaxb/types/PolymorpicTestBase.java | 2 +- - .../module/jaxb/types/TestCyclicTypes.java | 2 +- - .../jaxb/types/TestJaxbPolymorphic.java | 2 +- - .../jaxb/types/TestJaxbPolymorphicLists.java | 2 +- - .../jaxb/types/TestJaxbPolymorphicMaps.java | 2 +- - .../jaxb/types/TestJaxbTypeCoercion1023.java | 2 +- - .../module/jaxb/types/TestJaxbTypes.java | 2 +- - 36 files changed, 163 insertions(+), 60 deletions(-) - create mode 100644 afterburner/dependency-reduced-pom.xml - -diff --git a/afterburner/dependency-reduced-pom.xml b/afterburner/dependency-reduced-pom.xml -new file mode 100644 -index 00000000..275bc903 ---- /dev/null -+++ b/afterburner/dependency-reduced-pom.xml -@@ -0,0 +1,103 @@ -+ -+ -+ -+ jackson-modules-base -+ com.fasterxml.jackson.module -+ 2.15.0-SNAPSHOT -+ -+ 4.0.0 -+ jackson-module-afterburner -+ bundle -+ Jackson module: Afterburner -+ Jackson (https://github.com/FasterXML/jackson) extension module -+used to enhance performance using bytecode generation to replace use of Reflection for -+field access and method calls -+ https://github.com/FasterXML/jackson-modules-base -+ -+ -+ The Apache Software License, Version 2.0 -+ https://www.apache.org/licenses/LICENSE-2.0.txt -+ repo -+ -+ -+ -+ -+ -+ com.google.code.maven-replacer-plugin -+ replacer -+ -+ -+ process-packageVersion -+ generate-sources -+ -+ -+ -+ -+ maven-shade-plugin -+ -+ -+ package -+ -+ shade -+ -+ -+ -+ -+ org.ow2.asm:asm -+ -+ -+ -+ -+ org.objectweb.asm -+ com.fasterxml.jackson.module.afterburner.asm -+ -+ -+ -+ -+ -+ -+ -+ org.moditect -+ moditect-maven-plugin -+ -+ -+ -+ -+ -+ com.fasterxml.jackson.core -+ jackson-core -+ 2.15.0-SNAPSHOT -+ compile -+ -+ -+ com.fasterxml.jackson.core -+ jackson-databind -+ 2.15.0-SNAPSHOT -+ compile -+ -+ -+ com.fasterxml.jackson.core -+ jackson-annotations -+ 2.15.0-SNAPSHOT -+ provided -+ -+ -+ junit -+ junit -+ 4.13.2 -+ test -+ -+ -+ hamcrest-core -+ org.hamcrest -+ -+ -+ -+ -+ -+ com/fasterxml/jackson/module/afterburner -+ org.objectweb.asm;resolution:=optional, -+* -+ ${project.groupId}.afterburner -+ -+ -diff --git a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/AdapterConverter.java b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/AdapterConverter.java -index 3e45f695..a3482e52 100644 ---- a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/AdapterConverter.java -+++ b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/AdapterConverter.java -@@ -1,6 +1,6 @@ - package com.fasterxml.jackson.module.jaxb; - --import javax.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; - - import com.fasterxml.jackson.databind.JavaType; - import com.fasterxml.jackson.databind.type.TypeFactory; -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 908b89e0..d859b9b2 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 -@@ -4,9 +4,9 @@ import java.lang.annotation.Annotation; - import java.lang.reflect.*; - import java.util.*; - --import javax.xml.bind.*; --import javax.xml.bind.annotation.*; --import javax.xml.bind.annotation.adapters.*; -+import jakarta.xml.bind.*; -+import jakarta.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.adapters.*; - - import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; - import com.fasterxml.jackson.annotation.*; -@@ -33,17 +33,17 @@ import com.fasterxml.jackson.module.jaxb.ser.DataHandlerJsonSerializer; - * - *
  • {@link XmlAnyElement} not supported; unlikely to ever be supported. - *
    • -- *
  • {@link javax.xml.bind.annotation.XmlAttachmentRef}: JSON does not support external attachments -+ *
  • {@link jakarta.xml.bind.annotation.XmlAttachmentRef}: JSON does not support external attachments - *
  • {@link XmlElementDecl} - *
  • {@link XmlElementRefs} because Jackson doesn't have any support for 'named' collection items; - * some parts could theoretically be supported - *
    • -- *
  • {@link javax.xml.bind.annotation.XmlInlineBinaryData} since the underlying concepts -+ *
  • {@link jakarta.xml.bind.annotation.XmlInlineBinaryData} since the underlying concepts - * (like XOP) do not exist in JSON -- Jackson will always use inline base64 encoding as the method -- *
  • {@link javax.xml.bind.annotation.XmlList} because JSON does not have (or necessarily need) -+ *
  • {@link jakarta.xml.bind.annotation.XmlList} because JSON does not have (or necessarily need) - * method of serializing list of values as space-separated Strings -- *
  • {@link javax.xml.bind.annotation.XmlMimeType} -- *
  • {@link javax.xml.bind.annotation.XmlMixed} since JSON has no concept of mixed content -+ *
  • {@link jakarta.xml.bind.annotation.XmlMimeType} -+ *
  • {@link jakarta.xml.bind.annotation.XmlMixed} since JSON has no concept of mixed content - *
  • {@link XmlRegistry} not supported, unlikely to ever be. - *
  • {@link XmlSchema} not supported, unlikely to ever be. - *
  • {@link XmlSchemaType} not supported, unlikely to ever be. -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/MapAdapter.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/MapAdapter.java -index 239e88f6..7509a918 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/MapAdapter.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/MapAdapter.java -@@ -1,6 +1,6 @@ - package com.fasterxml.jackson.module.jaxb.adapters; - --import javax.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; - - - import java.util.HashMap; -@@ -29,4 +29,4 @@ public class MapAdapter extends XmlAdapter, Map> - } - return theMap; - } --} -\ No newline at end of file -+} -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptedMapType.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptedMapType.java -index 72f94232..29d0161c 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptedMapType.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptedMapType.java -@@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.jaxb.adapters; - import java.io.*; - import java.util.*; - --import javax.xml.bind.annotation.adapters.XmlAdapter; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - import com.fasterxml.jackson.databind.ObjectMapper; - -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdapters.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdapters.java -index 5b91d555..e85b82b6 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdapters.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdapters.java -@@ -2,9 +2,9 @@ package com.fasterxml.jackson.module.jaxb.adapters; - - import java.util.*; - --import javax.xml.bind.annotation.*; --import javax.xml.bind.annotation.adapters.XmlAdapter; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+import jakarta.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - import com.fasterxml.jackson.databind.ObjectMapper; - import com.fasterxml.jackson.module.jaxb.BaseJaxbTest; -@@ -77,7 +77,7 @@ public class TestAdapters extends BaseJaxbTest - - @Override - public Calendar unmarshal(String value) { -- return (javax.xml.bind.DatatypeConverter.parseDateTime(value)); -+ return (jakarta.xml.bind.DatatypeConverter.parseDateTime(value)); - } - - @Override -@@ -85,7 +85,7 @@ public class TestAdapters extends BaseJaxbTest - if (value == null) { - return null; - } -- return (javax.xml.bind.DatatypeConverter.printDateTime(value)); -+ return (jakarta.xml.bind.DatatypeConverter.printDateTime(value)); - } - } - -@@ -111,7 +111,7 @@ public class TestAdapters extends BaseJaxbTest - public static class Adapter1 extends XmlAdapter { - @Override - public Long unmarshal(String value) { -- return ((long) javax.xml.bind.DatatypeConverter.parseLong(value)); -+ return ((long) jakarta.xml.bind.DatatypeConverter.parseLong(value)); - } - - @Override -@@ -119,7 +119,7 @@ public class TestAdapters extends BaseJaxbTest - if (value == null) { - return null; - } -- return (javax.xml.bind.DatatypeConverter.printLong((long) (long) value)); -+ return (jakarta.xml.bind.DatatypeConverter.printLong((long) (long) value)); - } - } - -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptersForContainers.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptersForContainers.java -index f0b7df80..b720d8f4 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptersForContainers.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptersForContainers.java -@@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.jaxb.adapters; - import java.util.*; - import java.util.Map.Entry; - --import javax.xml.bind.annotation.*; --import javax.xml.bind.annotation.adapters.*; -+import jakarta.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.adapters.*; - - import com.fasterxml.jackson.databind.ObjectMapper; - import com.fasterxml.jackson.databind.SerializationFeature; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestIdentityAdapters.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestIdentityAdapters.java -index bd2792f4..9053a447 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestIdentityAdapters.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestIdentityAdapters.java -@@ -1,7 +1,7 @@ - package com.fasterxml.jackson.module.jaxb.adapters; - --import javax.xml.bind.annotation.adapters.XmlAdapter; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - import com.fasterxml.jackson.databind.ObjectMapper; - import com.fasterxml.jackson.module.jaxb.BaseJaxbTest; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestUnwrapping.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestUnwrapping.java -index a428b49d..a180a529 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestUnwrapping.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestUnwrapping.java -@@ -1,6 +1,6 @@ - package com.fasterxml.jackson.module.jaxb.failing; - --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import com.fasterxml.jackson.annotation.JsonUnwrapped; - import com.fasterxml.jackson.databind.*; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestXmlID3.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestXmlID3.java -index 71d9492c..4d944602 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestXmlID3.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestXmlID3.java -@@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.jaxb.failing; - import java.util.Arrays; - import java.util.List; - --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlID; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlID; - - import com.fasterxml.jackson.databind.ObjectMapper; - import com.fasterxml.jackson.module.jaxb.BaseJaxbTest; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID.java -index af5b235f..9b6b1161 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID.java -@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.id; - - import java.util.*; - --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import com.fasterxml.jackson.databind.ObjectMapper; - import com.fasterxml.jackson.module.jaxb.BaseJaxbTest; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID2.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID2.java -index eabb71f4..4a775a0c 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID2.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID2.java -@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.id; - - import java.util.*; - --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import com.fasterxml.jackson.annotation.JsonPropertyOrder; - import com.fasterxml.jackson.core.type.TypeReference; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAccessType.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAccessType.java -index 82cc66a8..6c3151dc 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAccessType.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAccessType.java -@@ -2,9 +2,9 @@ package com.fasterxml.jackson.module.jaxb.introspect; - - import java.util.*; - --import javax.xml.bind.annotation.*; --import javax.xml.bind.annotation.adapters.XmlAdapter; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+import jakarta.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - import com.fasterxml.jackson.databind.*; - import com.fasterxml.jackson.module.jaxb.BaseJaxbTest; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAnnotationPriority.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAnnotationPriority.java -index 2d2b341b..46a9f3ee 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAnnotationPriority.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAnnotationPriority.java -@@ -1,6 +1,6 @@ - package com.fasterxml.jackson.module.jaxb.introspect; - --import javax.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlElement; - - import com.fasterxml.jackson.databind.ObjectMapper; - import com.fasterxml.jackson.module.jaxb.BaseJaxbTest; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestIntrospectorPair.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestIntrospectorPair.java -index 66006a31..5ecf19bf 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestIntrospectorPair.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestIntrospectorPair.java -@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.introspect; - - import java.util.*; - --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import com.fasterxml.jackson.annotation.*; - import com.fasterxml.jackson.databind.*; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAnnotationIntrospector.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAnnotationIntrospector.java -index f5bfa936..9931f1af 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAnnotationIntrospector.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAnnotationIntrospector.java -@@ -2,9 +2,9 @@ package com.fasterxml.jackson.module.jaxb.introspect; - - import java.util.*; - --import javax.xml.bind.annotation.*; --import javax.xml.bind.annotation.adapters.XmlAdapter; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+import jakarta.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import javax.xml.namespace.QName; - - import com.fasterxml.jackson.databind.*; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAutoDetect.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAutoDetect.java -index 5e7c79eb..9841c930 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAutoDetect.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAutoDetect.java -@@ -4,7 +4,7 @@ import java.io.*; - import java.math.BigDecimal; - import java.util.Map; - --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import com.fasterxml.jackson.databind.*; - import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbFieldAccess.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbFieldAccess.java -index 5fc85b9f..b9530d3e 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbFieldAccess.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbFieldAccess.java -@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.introspect; - - import java.io.IOException; - --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import com.fasterxml.jackson.databind.*; - -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyOrdering.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyOrdering.java -index 17a347a9..dcbd1dac 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyOrdering.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyOrdering.java -@@ -1,6 +1,6 @@ - package com.fasterxml.jackson.module.jaxb.introspect; - --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import com.fasterxml.jackson.databind.ObjectMapper; - import com.fasterxml.jackson.module.jaxb.BaseJaxbTest; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyVisibility.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyVisibility.java -index f73ff664..691bc7d8 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyVisibility.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyVisibility.java -@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.introspect; - - import java.io.IOException; - --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import com.fasterxml.jackson.annotation.JsonPropertyOrder; - import com.fasterxml.jackson.databind.*; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestXmlValue.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestXmlValue.java -index 9b440492..52c040f9 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestXmlValue.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestXmlValue.java -@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.introspect; - - import java.io.IOException; - --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import com.fasterxml.jackson.annotation.JsonProperty; - import com.fasterxml.jackson.databind.*; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestElementWrapper.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestElementWrapper.java -index fbaf7dd3..b5e5165c 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestElementWrapper.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestElementWrapper.java -@@ -2,8 +2,8 @@ package com.fasterxml.jackson.module.jaxb.misc; - - import java.util.*; - --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlElementWrapper; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlElementWrapper; - - import com.fasterxml.jackson.databind.MapperFeature; - import com.fasterxml.jackson.databind.ObjectMapper; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestEnums.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestEnums.java -index 50de1236..4ffccf32 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestEnums.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestEnums.java -@@ -1,6 +1,6 @@ - package com.fasterxml.jackson.module.jaxb.misc; - --import javax.xml.bind.annotation.XmlEnum; -+import jakarta.xml.bind.annotation.XmlEnum; - - import com.fasterxml.jackson.databind.ObjectMapper; - import com.fasterxml.jackson.module.jaxb.BaseJaxbTest; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestJaxbNullProperties.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestJaxbNullProperties.java -index d684df7f..5172819e 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestJaxbNullProperties.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestJaxbNullProperties.java -@@ -1,7 +1,7 @@ - package com.fasterxml.jackson.module.jaxb.misc; - --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - import com.fasterxml.jackson.annotation.JsonInclude; - import com.fasterxml.jackson.databind.ObjectMapper; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestRootName.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestRootName.java -index 98fed553..f45b5728 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestRootName.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestRootName.java -@@ -1,6 +1,6 @@ - package com.fasterxml.jackson.module.jaxb.misc; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - import com.fasterxml.jackson.databind.ObjectMapper; - import com.fasterxml.jackson.databind.SerializationFeature; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSchemaGeneration.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSchemaGeneration.java -index 513ae199..c3fa4b71 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSchemaGeneration.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSchemaGeneration.java -@@ -1,6 +1,6 @@ - package com.fasterxml.jackson.module.jaxb.misc; - --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import com.fasterxml.jackson.databind.JsonNode; - import com.fasterxml.jackson.databind.ObjectMapper; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSerializationInclusion.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSerializationInclusion.java -index 95a6592b..c4688bef 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSerializationInclusion.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSerializationInclusion.java -@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.misc; - - import java.util.List; - --import javax.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlElement; - - import com.fasterxml.jackson.annotation.JsonInclude; - import com.fasterxml.jackson.databind.ObjectMapper; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestXmlAnyElementWithElementRef.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestXmlAnyElementWithElementRef.java -index 55731622..977ea0b5 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestXmlAnyElementWithElementRef.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestXmlAnyElementWithElementRef.java -@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.misc; - - import java.util.*; - --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import com.fasterxml.jackson.databind.ObjectMapper; - import com.fasterxml.jackson.module.jaxb.BaseJaxbTest; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/package-info.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/package-info.java -index 83bfdde4..ef27cae6 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/package-info.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/package-info.java -@@ -1,8 +1,8 @@ - /** - * Package info can be used to add "package annotations", so here we are... - */ --@javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters({ -- @javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter( -+@jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters({ -+ @jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter( - type = javax.xml.namespace.QName.class, - value = com.fasterxml.jackson.module.jaxb.introspect.TestJaxbAnnotationIntrospector.QNameAdapter.class - ) -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/PolymorpicTestBase.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/PolymorpicTestBase.java -index 8d4f635e..a6bedfc4 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/PolymorpicTestBase.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/PolymorpicTestBase.java -@@ -1,6 +1,6 @@ - package com.fasterxml.jackson.module.jaxb.types; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - import com.fasterxml.jackson.module.jaxb.BaseJaxbTest; - -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestCyclicTypes.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestCyclicTypes.java -index 9454eeba..3d2d57a5 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestCyclicTypes.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestCyclicTypes.java -@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.types; - - import java.util.*; - --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import com.fasterxml.jackson.databind.*; - -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphic.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphic.java -index e97df8bd..1ea9514e 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphic.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphic.java -@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.types; - - import java.util.*; - --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import com.fasterxml.jackson.databind.ObjectMapper; - -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicLists.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicLists.java -index 41909219..afe417d1 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicLists.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicLists.java -@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.types; - - import java.util.*; - --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import com.fasterxml.jackson.databind.ObjectMapper; - -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicMaps.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicMaps.java -index b3568f32..67bc045e 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicMaps.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicMaps.java -@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.types; - - import java.util.*; - --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import com.fasterxml.jackson.databind.ObjectMapper; - -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypeCoercion1023.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypeCoercion1023.java -index 6b49fd20..843f0a0a 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypeCoercion1023.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypeCoercion1023.java -@@ -1,6 +1,6 @@ - package com.fasterxml.jackson.module.jaxb.types; - --import javax.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlElement; - - import com.fasterxml.jackson.databind.ObjectMapper; - import com.fasterxml.jackson.module.jaxb.BaseJaxbTest; -diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypes.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypes.java -index 2031f014..2efec6a2 100644 ---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypes.java -+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypes.java -@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.types; - - import java.util.*; - --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import com.fasterxml.jackson.annotation.JsonPropertyOrder; - import com.fasterxml.jackson.annotation.JsonTypeInfo; --- -2.39.0 - diff --git a/README.packit b/README.packit deleted file mode 100644 index d529207..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 0.87.1. diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5724697 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +jackson-modules-base package is retired on branch c10s for CS-2365 \ No newline at end of file diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index c8aa455..0000000 --- a/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# recipients: rhcs-team ---- !Policy -product_versions: - - rhel-10 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/jackson-modules-base.spec b/jackson-modules-base.spec deleted file mode 100644 index a66cc43..0000000 --- a/jackson-modules-base.spec +++ /dev/null @@ -1,290 +0,0 @@ -%bcond_with jp_minimal - -Name: jackson-modules-base -Version: 2.16.1 -Release: 3%{?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 -Patch3: 0001-Use-jakarta.activation-namespace-in-jaxb-api.patch - -BuildRequires: maven-local -BuildRequires: mvn(cglib:cglib) -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) >= %{version} -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) -BuildRequires: mvn(jakarta.xml.bind:jakarta.xml.bind-api) -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.mockito:mockito-all) -BuildRequires: mvn(org.ow2.asm:asm) - -BuildArch: noarch -%if 0%{?fedora} || 0%{?rhel} >= 10 -ExclusiveArch: %{java_arches} noarch -%endif - -%description -Jackson "base" modules: modules that build directly on databind, -and are not data-type, data format, or JAX-RS provider modules. - -%package -n jackson-module-jaxb-annotations -Summary: Support for using JAXB annotations as an alternative to "native" Jackson annotations - -%description -n jackson-module-jaxb-annotations -This Jackson extension module provides support for using JAXB (javax.xml.bind) -annotations as an alternative to native Jackson annotations. It is most often -used to make it easier to reuse existing data beans that used with JAXB -framework to read and write XML. - -%prep -%autosetup -n %{name}-%{name}-%{version} -p 1 - -%pom_remove_dep -r org.glassfish.jaxb:jaxb-runtime -%pom_remove_plugin "de.jjohannes:gradle-module-metadata-maven-plugin" - -# no need for Java 9 module stuff -%pom_remove_plugin -r :moditect-maven-plugin - -# Disable bundling of asm -%pom_remove_plugin ":maven-shade-plugin" afterburner mrbean paranamer - -sed -i 's/\r//' mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} -cp -p mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} . - -# Fix OSGi dependency -%pom_change_dep org.osgi:org.osgi.core org.osgi:osgi.core osgi - -# NoClassDefFoundError: net/sf/cglib/core/CodeGenerationException -%pom_add_dep cglib:cglib:3.2.4:test guice - -%pom_disable_module afterburner -%pom_disable_module android-record -%pom_disable_module guice -%pom_disable_module guice7 -%pom_disable_module mrbean -%pom_disable_module osgi -%pom_disable_module paranamer -%pom_disable_module jakarta-xmlbind -%pom_disable_module blackbird -%pom_disable_module no-ctor-deser - -# Allow javax,activation to be optional -%pom_add_plugin "org.apache.felix:maven-bundle-plugin" jaxb " - - - javax.activation;resolution:=optional,* - -" - -# This test fails since mockito was upgraded to 2.x -rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.java - -%mvn_file ":{*}" jackson-modules/@1 - -%build -%mvn_build -s -j - -%install -%mvn_install - -%files -f .mfiles-jackson-modules-base -%doc README.md release-notes -%license LICENSE NOTICE - -%files -n jackson-module-jaxb-annotations -f .mfiles-jackson-module-jaxb-annotations -%doc jaxb/README.md jaxb/release-notes -%license LICENSE NOTICE - -%changelog -* Mon Jun 24 2024 Troy Dawson - 2.16.1-3 -- Bump release for June 2024 mass rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 2.16.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 22 2024 Marco Fargetta - 2.16.1-1 -- [maven-release-plugin] prepare release jackson-modules-base-2.16.1 (Tatu Saloranta) -- Prepare for 2.16.1 release (Tatu Saloranta) -- Fix #231: change OSGi dep of "activation" package to jakarta (from javax) (Tatu Saloranta) -- Back to snapshot deps (Tatu Saloranta) -- [maven-release-plugin] prepare for next development iteration (Tatu Saloranta) - -* Sat Jan 20 2024 Fedora Release Engineering - 2.16.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Nov 16 2023 Packit - 2.16.0-1 -- [maven-release-plugin] prepare release jackson-modules-base-2.16.0 (Tatu Saloranta) -- Prepare for 2.16.0 release (Tatu Saloranta) -- Updated doc. Added missing test accessor. (eranl) -- Minor test improvement to android module (Tatu Saloranta) -- Update release notes wrt #227 (Tatu Saloranta) -- Updated doc. Moved failing tests to 'failing' package. Added test for differing generic parameter types. Pruned BaseTest and BaseMapTest. Added comment about '-parameters' compiler option. (eranl) -- Addressed review comments With the goal of maximizing consistency with built-in record support, I copied and "desugared" some unit tests from https://github.com/FasterXML/jackson-databind/tree/2.16/src/test-jdk17/java/com/fasterxml/jackson/databind/records. A few of the test cases are failing, and I marked them with a "Failing" comment and a "notest" name prefix. I'm hoping for guidance about whether and how I should fix them. Fixed handling of getters Added support for injected values Added use of constructor parameter names Skip module if class already has a withArgsCreator (eranl) -- Add jackson-core dependency, animal-sniffer-maven-plugin, per review comments (eranl) -- Add Android Record Module (eranl) -- Move now passing #223 test to non-failing package (Tatu Saloranta) -- Fix #223: apply check for default (interface) method in all applicable places (Tatu Saloranta) -- Add test for #223: passes for Blackbird, fails for Afterburner (Tatu Saloranta) -- Test #30 simplification for blackbird too (Tatu Saloranta) -- Simplify test for #30 since Java 8 baseline for Jackson 2.x (Tatu Saloranta) -- Remove maven-wrapper.jar (Tatu Saloranta) -- Back to snapshot dep (Tatu Saloranta) -- [maven-release-plugin] prepare for next development iteration (Tatu Saloranta) -- Resolves rhbz#2249935 - -* Mon Nov 06 2023 Chris Kelley - 2.15.3-1 -- [maven-release-plugin] prepare release jackson-modules-base-2.15.3 (Tatu Saloranta) -- Prepare for 2.15.3 release (Tatu Saloranta) -- Udpate Maven wrapper version (Tatu Saloranta) -- 2.15.3-SNAPSHOT (Tatu Saloranta) -- [maven-release-plugin] prepare for next development iteration (Tatu Saloranta) - -* Thu Jul 20 2023 Fedora Release Engineering - 2.15.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jun 19 2023 Chris Kelley - 2.15.2-1 -- Update to version 2.15.2 - -* Fri Feb 03 2023 Chris Kelley - 2.14.2-3 -- Remove dependency on jaxb-api2 compat package - -* 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 - -* Fri Jan 20 2023 Marian Koncek - 2.14.1-4 -- Depend on compat versions of activation and XML bind - -* Thu Jan 19 2023 Fedora Release Engineering - 2.14.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Dec 20 2022 Marian Koncek - 2.14.1-2 -- Rebuild with compat jakarta.activation version 1 - -* Wed Nov 23 2022 Chris Kelley - 2.14.1-1 -- Update to version 2.14.1 - -* Tue Nov 08 2022 Chris Kelley - 2.14.0-1 -- Update to version 2.14 -- Update to use SPDX licence - -* Thu Jul 21 2022 Fedora Release Engineering - 2.11.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 2.11.4-8 -- Rebuilt for Drop i686 JDKs - -* Sat Feb 05 2022 Jiri Vanek - 2.11.4-7 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 2.11.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Sep 22 2021 Dogtag PKI Team - 2.11.4-5 -- Drop jaxb-runtime dependency - -* Thu Jul 22 2021 Fedora Release Engineering - 2.11.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu May 20 2021 Dogtag PKI Team - 2.11.4-3 -- Drop jackson-module-afterburner, jackson-module-guice, jackson-module-mrbean, - jackson-module-osgi, jackson-module-paranamer, and jackson-module-javadoc - -* Tue Jan 26 2021 Fedora Release Engineering - 2.11.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jan 18 2021 Fabio Valentini - 2.11.4-1 -- Update to version 2.11.4. - -* Wed Oct 14 2020 Fabio Valentini - 2.11.3-1 -- Update to version 2.11.3. - -* Sat Aug 08 2020 Fabio Valentini - 2.11.2-1 -- Update to version 2.11.2. - -* Tue Jul 28 2020 Fedora Release Engineering - 2.11.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 2.11.1-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Mon Jul 06 2020 Fabio Valentini - 2.11.1-1 -- Update to version 2.11.1. - -* Mon May 25 2020 Fabio Valentini - 2.11.0-1 -- Update to version 2.11.0. - -* Fri May 08 2020 Fabio Valentini - 2.10.4-1 -- Update to version 2.10.4. - -* Tue Mar 03 2020 Fabio Valentini - 2.10.3-1 -- Update to version 2.10.3. - -* Wed Jan 29 2020 Fedora Release Engineering - 2.10.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 17 2020 Fabio Valentini - 2.10.2-1 -- Update to version 2.10.2. - -* Wed Nov 13 2019 Fabio Valentini - 2.10.1-1 -- Update to version 2.10.1. - -* Tue Oct 08 2019 Fabio Valentini - 2.10.0-1 -- Update to version 2.10.0. - -* Thu Jul 25 2019 Fedora Release Engineering - 2.9.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Mar 17 2019 Mat Booth - 2.9.8-2 -- Make the OSGi dep on javax.activation optional - -* Wed Feb 06 2019 Mat Booth - 2.9.8-1 -- Update to latest upstream release - -* Fri Feb 01 2019 Fedora Release Engineering - 2.9.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jan 11 2019 Mat Booth - 2.9.4-5 -- Avoid running test that fails since Mockito 2.x - -* Wed Aug 22 2018 Mat Booth - 2.9.4-4 -- Allow conditional building of some extra modules - -* Fri Jul 13 2018 Fedora Release Engineering - 2.9.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.9.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 24 2018 Mat Booth - 2.9.4-1 -- Update to latest upstream release - -* Tue Jan 23 2018 Mat Booth - 2.9.3-2 -- Properly obsolete jackson-module-jaxb-annotations-javadoc package - -* Tue Jan 23 2018 Mat Booth - 2.9.3-1 -- Update to latest upstream release -- Obsoletes standalone jaxb-annotations package now provided by this package - -* Wed Jul 26 2017 Fedora Release Engineering - 2.7.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.7.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Sep 20 2016 gil cattaneo 2.7.6-2 -- fix some rpmlint problems - -* Mon Aug 22 2016 gil cattaneo 2.7.6-1 -- initial rpm - diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf deleted file mode 100644 index c9358ca..0000000 --- a/plans/javapackages.fmf +++ /dev/null @@ -1,10 +0,0 @@ -summary: Run javapackages-specific tests -discover: - how: fmf - url: https://src.fedoraproject.org/tests/javapackages - ref: main -execute: - how: tmt -environment: - JP_VALIDATOR_SOURCE_PATH: '' - JP_VALIDATOR_ARGS: org.fedoraproject.javapackages.validator.validators.DefaultValidatorFactory diff --git a/sources b/sources deleted file mode 100644 index 17d8a25..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (jackson-modules-base-2.16.1.tar.gz) = 1ad10d15b01f684999cf4dee3fb001279ef8068206cd980a8497e62f32976dff47814d4157c8abc16778a6d09fac32c1d611de53c8913c5ca0e47518d5217384 diff --git a/tests/roles/Test_Setup/files/ca.cfg b/tests/roles/Test_Setup/files/ca.cfg deleted file mode 100644 index 158c1d5..0000000 --- a/tests/roles/Test_Setup/files/ca.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[DEFAULT] -pki_server_database_password=Secret.123 - -[CA] -pki_admin_email=caadmin@example.com -pki_admin_name=caadmin -pki_admin_nickname=caadmin -pki_admin_password=Secret.123 -pki_admin_uid=caadmin - -pki_client_database_password=Secret.123 -pki_client_database_purge=False -pki_client_pkcs12_password=Secret.123 - -pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com -pki_ds_database=ca -pki_ds_password=Secret.123 - -pki_security_domain_name=EXAMPLE - -pki_ca_signing_nickname=ca_signing -pki_ocsp_signing_nickname=ca_ocsp_signing -pki_audit_signing_nickname=ca_audit_signing -pki_sslserver_nickname=sslserver -pki_subsystem_nickname=subsystem