public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Marco Fargetta <mfargett@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/jackson-modules-base] rawhide: Fix patch file
Date: Tue, 14 Jul 2026 18:49:46 GMT	[thread overview]
Message-ID: <178405498624.1.14686442292279018767.rpms-jackson-modules-base-efd27ef9d7e0@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/jackson-modules-base
Branch : rawhide
Commit : efd27ef9d7e02a519770d8e82b70e5ea9f38f562
Author : Marco Fargetta <mfargett@redhat.com>
Date   : 2026-07-14T20:49:18+02:00
Stats  : +2/-36 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/jackson-modules-base/c/efd27ef9d7e02a519770d8e82b70e5ea9f38f562?branch=rawhide

Log:
Fix patch file

---
diff --git a/0001-Use-jakarta.activation-namespace-in-jaxb-api.patch b/0001-Use-jakarta.activation-namespace-in-jaxb-api.patch
index e58095d..34c12a6 100644
--- a/0001-Use-jakarta.activation-namespace-in-jaxb-api.patch
+++ b/0001-Use-jakarta.activation-namespace-in-jaxb-api.patch
@@ -1,4 +1,4 @@
-From f7239fcc026a4990a9d6d70877f0bf291f317fe2 Mon Sep 17 00:00:00 2001
+From 7f68763404b96507e5b7016d8b300fb22174c382 Mon Sep 17 00:00:00 2001
 From: Marco Fargetta <mfargett@redhat.com>
 Date: Tue, 14 Jul 2026 19:24:56 +0200
 Subject: [PATCH] Use jakarta.activation namespace in jaxb api
@@ -7,7 +7,6 @@ Subject: [PATCH] Use jakarta.activation namespace in jaxb api
  jaxb/README.md                                   |  2 +-
  .../jackson/module/jaxb/AdapterConverter.java    |  2 +-
  .../module/jaxb/JaxbAnnotationIntrospector.java  | 16 ++++++++--------
- .../jaxb/deser/DomElementJsonDeserializer.java   |  8 ++++----
  .../jackson/module/jaxb/adapters/MapAdapter.java |  4 ++--
  .../module/jaxb/adapters/TestAdaptedMapType.java |  4 ++--
  .../module/jaxb/adapters/TestAdapters.java       | 14 +++++++-------
@@ -24,7 +23,6 @@ Subject: [PATCH] Use jakarta.activation namespace in jaxb api
  .../jaxb/introspect/TestPropertyOrdering.java    |  2 +-
  .../jaxb/introspect/TestPropertyVisibility.java  |  2 +-
  .../module/jaxb/introspect/TestXmlValue.java     |  2 +-
- .../jaxb/misc/TestDomElementSerialization.java   |  2 +-
  .../module/jaxb/misc/TestElementWrapper.java     |  4 ++--
  .../jackson/module/jaxb/misc/TestEnums.java      |  2 +-
  .../module/jaxb/misc/TestJaxbNullProperties.java |  4 ++--
@@ -44,7 +42,7 @@ Subject: [PATCH] Use jakarta.activation namespace in jaxb api
  .../jaxb/types/TestJaxbTypeCoercion1023.java     |  2 +-
  .../jackson/module/jaxb/types/TestJaxbTypes.java |  2 +-
  .../jaxb/types/XmlSeeAlsoForSubtypes195Test.java |  2 +-
- 40 files changed, 71 insertions(+), 71 deletions(-)
+ 38 files changed, 66 insertions(+), 66 deletions(-)
 
 diff --git a/jaxb/README.md b/jaxb/README.md
 index 3f2fed92..acde7eea 100644
@@ -110,25 +108,6 @@ index 69790ee0..a85b6d22 100644
   * <li>{@link XmlRegistry} not supported, unlikely to ever be.
   * <li>{@link XmlSchema} not supported, unlikely to ever be.
   * <li>{@link XmlSchemaType} not supported, unlikely to ever be.
-diff --git a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/deser/DomElementJsonDeserializer.java b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/deser/DomElementJsonDeserializer.java
-index a5bb7206..a6c16d65 100644
---- a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/deser/DomElementJsonDeserializer.java
-+++ b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/deser/DomElementJsonDeserializer.java
-@@ -3,10 +3,10 @@ package com.fasterxml.jackson.module.jaxb.deser;
- import java.io.IOException;
- import java.util.Iterator;
- 
--import javax.xml.XMLConstants;
--import javax.xml.parsers.DocumentBuilder;
--import javax.xml.parsers.DocumentBuilderFactory;
--import javax.xml.parsers.ParserConfigurationException;
-+import jakarta.xml.XMLConstants;
-+import jakarta.xml.parsers.DocumentBuilder;
-+import jakarta.xml.parsers.DocumentBuilderFactory;
-+import jakarta.xml.parsers.ParserConfigurationException;
- 
- import org.w3c.dom.Document;
- import org.w3c.dom.Element;
 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 d8e22e64..ad1411a8 100644
 --- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/MapAdapter.java
@@ -396,19 +375,6 @@ index 385e0dc3..9a462af6 100644
  
  import org.junit.jupiter.api.Test;
  
-diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestDomElementSerialization.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestDomElementSerialization.java
-index 561e3adb..40945071 100644
---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestDomElementSerialization.java
-+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestDomElementSerialization.java
-@@ -3,7 +3,7 @@ package com.fasterxml.jackson.module.jaxb.misc;
- import org.w3c.dom.Document;
- import org.w3c.dom.Element;
- 
--import javax.xml.parsers.DocumentBuilderFactory;
-+import jakarta.xml.parsers.DocumentBuilderFactory;
- import java.io.ByteArrayInputStream;
- import java.io.StringWriter;
- 
 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 14ac2885..f72ee7af 100644
 --- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestElementWrapper.java

                 reply	other threads:[~2026-07-14 18:49 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178405498624.1.14686442292279018767.rpms-jackson-modules-base-efd27ef9d7e0@fedoraproject.org \
    --to=mfargett@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox