Merge branch '2.x' into 3.0

Author: cowtowncoder

release-notes/VERSION

@@ -14,6 +14,10 @@ Versions: 3.x (for earlier see VERSION-2.x)
 #5393: `@JsonAnyGetter` property gets included in generated schema
  (reported by @victor-noel-pfx)
  (fix by Joo-Hyuk K)
+#5398: `@JsonProperty.value` + `@JsonIgnore` on setter does not work
+  anymore since 2.18.4
+ (reported by @victor-noel-pfx)
+ (fix by @cowtowncoder, w/ Claude code)
 #5401: Regression with `@JsonCreator` that returns `null` for empty strings
  (fix contributed by Joost K)
 #5408: Jackson 3 `JsonNode#required(java.lang.String)` throws `JsonNodeException`

release-notes/VERSION-2.x

@@ -19,10 +19,14 @@ Project: jackson-databind
   customizability
  (contributed by @wrongwrong)
 #5361: Fix Maven SBOM publishing
+#5398: `@JsonProperty.value` + `@JsonIgnore` on setter does not work
+  anymore since 2.18.4
+ (reported by @victor-noel-pfx)
+ (fix by @cowtowncoder, w/ Claude code)
 
 2.20.2 (not yet released)
 
-#5393: `@JsonAnyGetter property gets included in generated schema since 2.19.0`
+#5393: `@JsonAnyGetter` property gets included in generated schema since 2.19.0
  (reported by @victor-noel-pfx)
  (fix by Joo-Hyuk K)
 

src/main/java/tools/jackson/databind/introspect/POJOPropertiesCollector.java

@@ -1514,13 +1514,19 @@ protected void _renameProperties(Map<String, POJOPropertyBuilder> props)
             POJOPropertyBuilder prop = entry.getValue();
 
             // 10-Apr-2025: [databind#4628] skip properties that are marked to be ignored
-            // TODO: we are using implicit name, is that ok?
+            // 19-Nov-2025: [databind#5398] BUT do not skip if property has explicit names
+            //   on accessors that are NOT ignored (e.g., @JsonProperty on getter but @JsonIgnore on setter).
+            //   NOTE: For Records we need to be more conservative as constructor parameters may have
+            //   both annotations but generated accessors don't always inherit @JsonIgnore
             if (_ignoredPropertyNames != null && _ignoredPropertyNames.contains(prop.getName())) {
-                continue;
+                // For Records: always skip (safer due to annotation inheritance issues)
+                // For regular classes: only skip if NO explicit names on non-ignored accessors
+                if (isRecordType() || !prop.anyExplicitsWithoutIgnoral()) {
+                    continue;
+                }
             }
 
             Collection<PropertyName> l = prop.findExplicitNames();
-
             // no explicit names? Implicit one is fine as is
             if (l.isEmpty()) {
                 continue;

src/test/java/tools/jackson/databind/introspect/JsonPropertyRename5398Test.java

@@ -0,0 +1,47 @@
+package tools.jackson.databind.introspect;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.*;
+
+import tools.jackson.databind.*;
+import tools.jackson.databind.testutil.DatabindTestUtil;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+// [databind#5398] @JsonProperty on getter with @JsonIgnore on setter
+// causes deserialization to fail since 2.18.4
+public class JsonPropertyRename5398Test extends DatabindTestUtil
+{
+    static class Test5398 {
+        private String prop = "someValue";
+
+        @JsonProperty(value = "renamedProp")
+        public String getProp() {
+            return prop;
+        }
+
+        @JsonIgnore
+        public void setProp(String prop) {
+            this.prop = prop;
+        }
+    }
+
+    private final ObjectMapper MAPPER = newJsonMapper();
+
+    @Test
+    public void testRenamedPropertyWithIgnoredSetter5398()
+    {
+        Test5398 original = new Test5398();
+        String json = MAPPER.writeValueAsString(original);
+
+        // Should serialize with renamed property
+        assertEquals("{\"renamedProp\":\"someValue\"}", json);
+
+        // Should be able to deserialize back (setter is ignored, so field remains default)
+        Test5398 result = MAPPER.readValue(json, Test5398.class);
+        assertNotNull(result);
+        // Since setter is ignored, the deserialized object should have the default value
+        assertEquals("someValue", result.getProp());
+    }
+}