Merge branch '2.x' into 3.0

Author: cowtowncoder

pom.xml

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

src/main/java/module-info.java

@@ -39,6 +39,7 @@
     requires transitive tools.jackson.module.afterburner;
     requires transitive tools.jackson.module.blackbird;
     requires transitive tools.jackson.module.kotlin;
+//    requires transitive tools.jackson.module.mrbean;
 
     // 3rd party
     requires transitive com.google.common;

src/test/java/module-info.java

@@ -22,6 +22,7 @@
     opens tools.jackson.integtest.immutables;
     opens tools.jackson.integtest.jacksonjr;
     opens tools.jackson.integtest.jdk;
+    opens tools.jackson.integtest.mrbean;
     opens tools.jackson.integtest.spi;
     opens tools.jackson.integtest.testutil;
 }

src/test/java/tools/jackson/integtest/mrbean/MrBeanTest.java

@@ -0,0 +1,48 @@
+package tools.jackson.integtest.mrbean;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.databind.ObjectMapper;
+
+import tools.jackson.module.mrbean.MrBeanModule;
+
+import tools.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/tools/jackson/integtest/gradle/build.gradle.kts

@@ -10,15 +10,20 @@ val modulesWithoutGradleMetadata = listOf(
         "tools.jackson.module:jackson-module-scala_2.13", // built with sbt
         "tools.jackson.module:jackson-module-scala_3",     // built with sbt
 
+        // 31-Oct-2025, tatu: does not depend on jackson-bom; 2.20 naming convention different
+        "com.fasterxml.jackson.core:jackson-annotations",
+
         // 3rd-party managed dependencies, by XML module:
         "com.fasterxml.woodstox:woodstox-core",
         "org.codehaus.woodstox:stax2-api" // for Woodstox
 )
 
 dependencies {
-    implementation(platform("tools.jackson:jackson-bom:+"))
+    // 18-Jul-2025, tatu: Choose one or the other of these (regular vs SNAPSHOT)
+    //                                                  | 
+    //                                                  V
 
-    // 28-Apr-2023, tatu: Uncomment following (and comment ^^^) to test SNAPSHOT versions
+    implementation(platform("tools.jackson:jackson-bom:+"))
     //implementation(platform("tools.jackson:jackson-bom:3.0.1-SNAPSHOT"))
     // Need just new Snapshot repo (everything)
     repositories.maven("https://central.sonatype.com/repository/maven-snapshots");