Merge branch 'feature/jackson3' into develop

Author: io7m

README-CHANGES.xml

@@ -17,7 +17,7 @@
         <c:change date="2024-05-11T00:00:00+00:00" summary="Move to new organization."/>
       </c:changes>
     </c:release>
-    <c:release date="2025-08-26T11:22:08+00:00" is-open="false" ticket-system="com.github.io7m.dixmont" version="2.1.0">
+    <c:release date="2025-08-26T00:00:00+00:00" is-open="false" ticket-system="com.github.io7m.dixmont" version="2.1.0">
       <c:changes>
         <c:change date="2024-06-28T00:00:00+00:00" summary="Update junit.version:5.10.2 → 5.10.3."/>
         <c:change date="2024-07-08T00:00:00+00:00" summary="Update jackson.version:2.17.1 → 2.17.2."/>
@@ -54,6 +54,11 @@
         <c:change date="2025-08-26T00:00:00+00:00" summary="Target JDK 17 bytecode."/>
       </c:changes>
     </c:release>
+    <c:release date="2025-11-29T09:49:50+00:00" is-open="true" ticket-system="com.github.io7m.dixmont" version="3.0.0">
+      <c:changes>
+        <c:change compatible="false" date="2025-11-29T09:49:50+00:00" summary="Upgrade to Jackson 3.0.2."/>
+      </c:changes>
+    </c:release>
   </c:releases>
   <c:ticket-systems>
     <c:ticket-system default="true" id="com.github.io7m.dixmont" url="https://www.github.com/io7m/dixmont/issues/"/>

README.in

@@ -32,7 +32,7 @@ $ mvn clean verify
 ### Usage
 
 Create a restricted serializer that is permitted to deserialize only the
-given classes and no others, and then register it with an `ObjectMapper`:
+given classes and no others, and then register it with a mapper:
 
 ```
 var serializers =
@@ -50,13 +50,13 @@ var serializers =
       "java.util.List<java.lang.String>")
     .build();
 
-var mapper =
-  JsonMapper.builder()
-    .build();
-
 final var simpleModule = new SimpleModule();
 simpleModule.setDeserializers(this.serializers);
-mapper.registerModule(simpleModule);
+
+final var mapper =
+  JsonMapper.builder()
+    .addModule(simpleModule)
+    .build();
 ```
 
 Parser code using the given `ObjectMapper` will be prevented from deserializing

README.md

@@ -48,7 +48,7 @@ $ mvn clean verify
 ### Usage
 
 Create a restricted serializer that is permitted to deserialize only the
-given classes and no others, and then register it with an `ObjectMapper`:
+given classes and no others, and then register it with a mapper:
 
 ```
 var serializers =
@@ -66,13 +66,13 @@ var serializers =
       "java.util.List<java.lang.String>")
     .build();
 
-var mapper =
-  JsonMapper.builder()
-    .build();
-
 final var simpleModule = new SimpleModule();
 simpleModule.setDeserializers(this.serializers);
-mapper.registerModule(simpleModule);
+
+final var mapper =
+  JsonMapper.builder()
+    .addModule(simpleModule)
+    .build();
 ```
 
 Parser code using the given `ObjectMapper` will be prevented from deserializing

com.io7m.dixmont.colors/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.dixmont</artifactId>
     <groupId>com.io7m.dixmont</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>com.io7m.dixmont.colors</artifactId>
 
@@ -20,11 +20,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
+      <groupId>tools.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
+      <groupId>tools.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
     </dependency>
 

com.io7m.dixmont.colors/src/main/java/com/io7m/dixmont/colors/DmColorDeserializer.java

@@ -16,12 +16,11 @@
 
 package com.io7m.dixmont.colors;
 
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import tools.jackson.core.JsonParser;
+import tools.jackson.databind.DeserializationContext;
+import tools.jackson.databind.deser.std.StdDeserializer;
+import tools.jackson.databind.exc.MismatchedInputException;
 
-import java.io.IOException;
 import java.util.regex.Pattern;
 
 /**
@@ -40,7 +39,7 @@ public final class DmColorDeserializer
 
   public DmColorDeserializer()
   {
-    this(null);
+    this(DmColor.class);
   }
 
   /**
@@ -59,7 +58,6 @@ public DmColorDeserializer(
   public DmColor deserialize(
     final JsonParser p,
     final DeserializationContext ctxt)
-    throws IOException
   {
     final var text = p.getValueAsString();
 
@@ -75,10 +73,10 @@ public DmColor deserialize(
       );
     }
 
-    throw new JsonParseException(
+    throw MismatchedInputException.from(
       p,
-      "Color values must match the pattern %s".formatted(COLOR_PATTERN),
-      p.getCurrentLocation()
+      DmColor.class,
+      "Color values must match the pattern %s".formatted(COLOR_PATTERN)
     );
   }
 }

com.io7m.dixmont.colors/src/main/java/com/io7m/dixmont/colors/DmColorModule.java

@@ -17,8 +17,8 @@
 
 package com.io7m.dixmont.colors;
 
-import com.fasterxml.jackson.databind.Module;
-import com.fasterxml.jackson.databind.module.SimpleModule;
+import tools.jackson.databind.JacksonModule;
+import tools.jackson.databind.module.SimpleModule;
 
 /**
  * The color module.
@@ -37,7 +37,7 @@ private DmColorModule()
    * @return The created module
    */
 
-  public static Module create()
+  public static JacksonModule create()
   {
     final var module = new SimpleModule();
     module.addDeserializer(DmColor.class, new DmColorDeserializer());

com.io7m.dixmont.colors/src/main/java/com/io7m/dixmont/colors/DmColorSerializer.java

@@ -16,11 +16,9 @@
 
 package com.io7m.dixmont.colors;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-
-import java.io.IOException;
+import tools.jackson.core.JsonGenerator;
+import tools.jackson.databind.SerializationContext;
+import tools.jackson.databind.ser.std.StdSerializer;
 
 /**
  * A serializer for color values.
@@ -55,8 +53,7 @@ public DmColorSerializer(
   public void serialize(
     final DmColor value,
     final JsonGenerator jgen,
-    final SerializerProvider provider)
-    throws IOException
+    final SerializationContext provider)
   {
     jgen.writeString(value.toString());
   }

com.io7m.dixmont.colors/src/main/java/com/io7m/dixmont/colors/package-info.java

@@ -19,7 +19,7 @@
  */
 
 @Export
-@Version("1.0.0")
+@Version("2.0.0")
 package com.io7m.dixmont.colors;
 
 import org.osgi.annotation.bundle.Export;

com.io7m.dixmont.colors/src/main/java/module-info.java

@@ -23,8 +23,8 @@
   requires static org.osgi.annotation.bundle;
   requires static org.osgi.annotation.versioning;
 
-  requires transitive com.fasterxml.jackson.core;
-  requires transitive com.fasterxml.jackson.databind;
+  requires tools.jackson.core;
+  requires tools.jackson.databind;
 
   exports com.io7m.dixmont.colors;
 

com.io7m.dixmont.core/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.dixmont</artifactId>
     <groupId>com.io7m.dixmont</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>com.io7m.dixmont.core</artifactId>
 
@@ -20,7 +20,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
+      <groupId>tools.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
     <dependency>