Merge branch '2.20' into 2.x

Author: cowtowncoder

pom.xml

@@ -209,6 +209,10 @@
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-afterburner</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-mrbean</artifactId>
+    </dependency>
 
     <!-- 04-Jun-2020, tatu: And why not Protobuf value type support too? -->
     <dependency>

src/test/java/com/fasterxml/jackson/integtest/mrbean/MrBeanTest.java

@@ -0,0 +1,48 @@
+package com.fasterxml.jackson.integtest.mrbean;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import com.fasterxml.jackson.module.mrbean.MrBeanModule;
+
+import com.fasterxml.jackson.integtest.BaseTest;
+
+// Copied from mrbean module tests ("RoundTripTest")
+public class MrBeanTest extends BaseTest
+{
+    public interface Bean {
+        String getField();
+        void setField(String field);
+    }
+
+    public interface ReadOnlyBean {
+        String getField();
+    }
+
+    private final ObjectMapper MAPPER = jsonMapperBuilder()
+            .addModule(new MrBeanModule())
+            .build();
+
+    @Test
+    public void testSimple() throws Exception
+    {
+        final String input = "{\"field\":\"testing\"}";
+        final Bean bean = MAPPER.readValue(input, Bean.class);
+        assertEquals("testing", bean.getField());
+        final String output = MAPPER.writeValueAsString(bean);
+        assertEquals(input, output);
+    }
+
+    @Test
+    public void testSimpleWithoutSetter() throws Exception
+    {
+        final String input = "{\"field\":\"testing\"}";
+        final ReadOnlyBean bean = MAPPER.readValue(input, ReadOnlyBean.class);
+        assertEquals("testing", bean.getField());
+        final String output = MAPPER.writeValueAsString(bean);
+        assertEquals(input, output);
+    }
+}

src/test/resources/com/fasterxml/jackson/integtest/gradle/build.gradle.kts

@@ -5,7 +5,8 @@ plugins {
 val modulesWithoutGradleMetadata = listOf(
         "com.fasterxml.jackson.jr:jackson-jr-all", // TODO is there a reason not to add this?
 
-        "com.fasterxml.jackson.core:jackson-annotations", // due to 2.x/3.x co-constraints
+        // 31-Oct-2025, tatu: does not depend on jackson-bom; 2.20 naming convention different
+        "com.fasterxml.jackson.core:jackson-annotations",
 
         "com.fasterxml.jackson:jackson-bom", // does not need it
         "com.fasterxml.jackson.module:jackson-module-scala_2.11", // built with sbt
@@ -19,9 +20,12 @@ val modulesWithoutGradleMetadata = listOf(
 )
 
 dependencies {
+    // 18-Jul-2025, tatu: Choose one or the other of these (regular vs SNAPSHOT)
+    //                                                  | 
+    //                                                  V
+
     //implementation(platform("com.fasterxml.jackson:jackson-bom:+"))
 
-    // 18-Jul-2025, tatu: Uncomment following (and comment ^^^) to test SNAPSHOT versions
     implementation(platform("com.fasterxml.jackson:jackson-bom:2.21.0-SNAPSHOT"))
     repositories.maven("https://central.sonatype.com/repository/maven-snapshots");
 }