public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/jackson-modules-base] rawhide: Fix QMame in jaxb patch
@ 2026-07-14 19:15 Marco Fargetta
0 siblings, 0 replies; only message in thread
From: Marco Fargetta @ 2026-07-14 19:15 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/jackson-modules-base
Branch : rawhide
Commit : 3ec23f6a1245651af3771d7871ea959dd77e553b
Author : Marco Fargetta <mfargett@redhat.com>
Date : 2026-07-14T21:15:13+02:00
Stats : +10/-14 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/jackson-modules-base/c/3ec23f6a1245651af3771d7871ea959dd77e553b?branch=rawhide
Log:
Fix QMame in jaxb patch
---
diff --git a/0001-Use-jakarta.activation-namespace-in-jaxb-api.patch b/0001-Use-jakarta.activation-namespace-in-jaxb-api.patch
index 34c12a6..4076b77 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 7f68763404b96507e5b7016d8b300fb22174c382 Mon Sep 17 00:00:00 2001
+From bcf49e986781a7f9d92e1639c8f00c64feaff4b7 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
@@ -17,7 +17,7 @@ Subject: [PATCH] Use jakarta.activation namespace in jaxb api
.../module/jaxb/introspect/TestAccessType.java | 6 +++---
.../jaxb/introspect/TestAnnotationPriority.java | 2 +-
.../jaxb/introspect/TestIntrospectorPair.java | 2 +-
- .../TestJaxbAnnotationIntrospector.java | 8 ++++----
+ .../TestJaxbAnnotationIntrospector.java | 6 +++---
.../jaxb/introspect/TestJaxbAutoDetect.java | 2 +-
.../jaxb/introspect/TestJaxbFieldAccess.java | 2 +-
.../jaxb/introspect/TestPropertyOrdering.java | 2 +-
@@ -30,7 +30,7 @@ Subject: [PATCH] Use jakarta.activation namespace in jaxb api
.../module/jaxb/misc/TestSchemaGeneration.java | 2 +-
.../jaxb/misc/TestSerializationInclusion.java | 2 +-
.../misc/TestXmlAnyElementWithElementRef.java | 2 +-
- .../jackson/module/jaxb/misc/package-info.java | 6 +++---
+ .../jackson/module/jaxb/misc/package-info.java | 4 ++--
.../jackson/module/jaxb/tofix/TestEnums256.java | 4 ++--
.../module/jaxb/tofix/TestUnwrapping.java | 2 +-
.../jackson/module/jaxb/tofix/TestXmlID3.java | 4 ++--
@@ -42,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 +-
- 38 files changed, 66 insertions(+), 66 deletions(-)
+ 38 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/jaxb/README.md b/jaxb/README.md
index 3f2fed92..acde7eea 100644
@@ -293,24 +293,22 @@ index 1c58a01b..b8544e3b 100644
import org.junit.jupiter.api.Test;
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 0d21554d..2bd481c3 100644
+index 0d21554d..d4ef9347 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,10 +2,10 @@ package com.fasterxml.jackson.module.jaxb.introspect;
+@@ -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 javax.xml.namespace.QName;
+import jakarta.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-+import jakarta.xml.namespace.QName;
+ import javax.xml.namespace.QName;
import org.junit.jupiter.api.Test;
-
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 804273a3..1ace281c 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAutoDetect.java
@@ -467,22 +465,20 @@ index 31dc328f..9499443b 100644
import org.junit.jupiter.api.Test;
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..93da73f0 100644
+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,9 +1,9 @@
+@@ -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(
-- type = javax.xml.namespace.QName.class,
+@jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters({
+ @jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter(
-+ type = jakarta.xml.namespace.QName.class,
+ 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/tofix/TestEnums256.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/tofix/TestEnums256.java
index 6f0bb67c..284957fa 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/tofix/TestEnums256.java
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-14 19:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-14 19:15 [rpms/jackson-modules-base] rawhide: Fix QMame in jaxb patch Marco Fargetta
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox