Merge branch '2.20' into 2.x

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -20,6 +20,12 @@ Project: jackson-databind
  (contributed by @wrongwrong)
 #5361: Fix Maven SBOM publishing
 
+2.20.2 (not yet released)
+
+#5393: `@JsonAnyGetter property gets included in generated schema since 2.19.0`
+ (reported by @victor-noel-pfx)
+ (fix by Joo-Hyuk K)
+
 2.20.1 (30-Oct-2025)
 
 #5292: `MapperFeature.FIX_FIELD_NAME_UPPER_CASE_PREFIX` does not work with

src/main/java/com/fasterxml/jackson/databind/ser/AnyGetterWriter.java

@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonObjectFormatVisitor;
 import com.fasterxml.jackson.databind.ser.std.MapSerializer;
 
 /**
@@ -89,6 +90,13 @@ public void serializeAsField(Object bean, JsonGenerator gen, SerializerProvider
         getAndSerialize(bean, gen, prov);
     }
 
+    @Override // @since 2.20
+    public void depositSchemaProperty(JsonObjectFormatVisitor v, SerializerProvider provider) throws JsonMappingException {
+        // 18-Nov-2025: [databind#5393] @JsonAnyGetter was getting included in generated schema
+
+        // no-op
+    }
+
     /**
      * @since 2.3
      */

src/test/java/com/fasterxml/jackson/databind/jsonschema/FormatVisitor5393Test.java

@@ -0,0 +1,75 @@
+package com.fasterxml.jackson.databind.jsonschema;
+
+import java.util.*;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.jsonFormatVisitors.*;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+// [databind#5393] @JsonAnyGetter property gets included in generated schema since 2.19.0
+public class FormatVisitor5393Test
+    extends DatabindTestUtil
+{
+    static class TestJsonIgnoredProperties
+    {
+        @JsonIgnore
+        public String ignoredProp;
+
+        public String normalProperty;
+
+        @JsonProperty("renamedProperty")
+        public String someProperty;
+
+        // [databind#5393]
+        @JsonAnyGetter
+        public Map<String, Object> anyProperties() {
+            return new TreeMap<>();
+        }
+    }
+
+    private final ObjectMapper MAPPER = newJsonMapper();
+
+    // [databind#5393]: regression wrt `@JsonAnyGetter`
+    @Test
+    public void ignoreExplicitlyIgnoredAndAnyGetter() throws Exception {
+        final TreeSet<String> expected = new TreeSet<>();
+        expected.add("normalProperty");
+        expected.add("renamedProperty");
+
+        final Set<String> actual = new TreeSet<>();
+        MAPPER.acceptJsonFormatVisitor(TestJsonIgnoredProperties.class,
+                new JsonFormatVisitorWrapper.Base() {
+                    @Override
+                    public JsonObjectFormatVisitor expectObjectFormat(JavaType type) {
+                        return new JsonObjectFormatVisitor.Base() {
+                            @Override
+                            public void property(BeanProperty prop) {
+                                actual.add(prop.getName());
+                            }
+
+                            @Override
+                            public void property(String name, JsonFormatVisitable handler, JavaType propertyTypeHint) {
+                                actual.add(name);
+                            }
+
+                            @Override
+                            public void optionalProperty(BeanProperty prop) {
+                                actual.add(prop.getName());
+                            }
+
+                            @Override
+                            public void optionalProperty(String name, JsonFormatVisitable handler, JavaType propertyTypeHint) {
+                                actual.add(name);
+                            }
+                        };
+                    }
+                });
+
+        assertEquals(expected, actual);
+    }
+}