Upgrade jackson to 3.1.0

bom/compile/pom.xml

@@ -392,7 +392,7 @@
     <dependency>
       <groupId>de.focus-shift</groupId>
       <artifactId>jollyday-jackson</artifactId>
-      <version>1.8.1</version>
+      <version>2.3.0</version>
       <scope>compile</scope>
     </dependency>
 

bom/runtime/pom.xml

@@ -19,8 +19,6 @@
     <californium.version>4.0.0-M2</californium.version>
     <!-- cxf can be updated independently of karaf, only used in karaf tests -->
     <cxf.version>3.6.10</cxf.version>
-    <jackson.annotations.version>2.21</jackson.annotations.version>
-    <jackson.version>2.21.1</jackson.version>
     <jetty.version>9.4.58.v20250814</jetty.version>
     <pax.logging.version>2.3.2</pax.logging.version>
     <pax.web.version>8.0.34</pax.web.version>
@@ -959,7 +957,7 @@
     <dependency>
       <groupId>de.focus-shift</groupId>
       <artifactId>jollyday-jackson</artifactId>
-      <version>1.8.1</version>
+      <version>2.3.0</version>
       <scope>compile</scope>
     </dependency>
 
@@ -979,61 +977,49 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
+      <groupId>tools.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
       <version>${jackson.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
+      <groupId>tools.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
       <version>${jackson.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <groupId>tools.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-cbor</artifactId>
       <version>${jackson.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <groupId>tools.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-xml</artifactId>
       <version>${jackson.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <groupId>tools.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-yaml</artifactId>
       <version>${jackson.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jdk8</artifactId>
-      <version>${jackson.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-      <version>${jackson.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <groupId>tools.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-base</artifactId>
       <version>${jackson.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <groupId>tools.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
       <version>${jackson.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
+      <groupId>tools.jackson.module</groupId>
       <artifactId>jackson-module-jaxb-annotations</artifactId>
       <version>${jackson.version}</version>
       <scope>compile</scope>

bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/automation/MarketplaceRuleTemplateProvider.java

@@ -43,8 +43,8 @@
 import org.osgi.service.component.annotations.ReferenceCardinality;
 import org.osgi.service.component.annotations.ReferencePolicy;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.dataformat.yaml.YAMLMapper;
 
 /**
  * This is a {@link RuleTemplateProvider}, which gets its content from the marketplace add-on service
@@ -65,8 +65,7 @@ public class MarketplaceRuleTemplateProvider extends AbstractManagedProvider<Rul
     @Activate
     public MarketplaceRuleTemplateProvider(final @Reference StorageService storageService) {
         super(storageService);
-        this.yamlMapper = new ObjectMapper(new YAMLFactory());
-        yamlMapper.findAndRegisterModules();
+        this.yamlMapper = YAMLMapper.builder().findAndAddModules().build();
     }
 
     /**

bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/CommunityBlockLibaryAddonHandler.java

@@ -37,8 +37,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.dataformat.yaml.YAMLMapper;
 
 /**
  * A {@link MarketplaceAddonHandler} implementation, which handles block libraries as YAML files and installs
@@ -58,9 +59,8 @@ public class CommunityBlockLibaryAddonHandler implements MarketplaceAddonHandler
     @Activate
     public CommunityBlockLibaryAddonHandler(final @Reference UIComponentRegistryFactory uiComponentRegistryFactory) {
         this.blocksRegistry = uiComponentRegistryFactory.getRegistry("ui:blocks");
-        this.yamlMapper = new ObjectMapper(new YAMLFactory());
-        yamlMapper.findAndRegisterModules();
-        this.yamlMapper.setDateFormat(new SimpleDateFormat("MMM d, yyyy, hh:mm:ss aa", Locale.ENGLISH));
+        this.yamlMapper = YAMLMapper.builder().findAndAddModules()
+                .defaultDateFormat(new SimpleDateFormat("MMM d, yyyy, hh:mm:ss aa", Locale.ENGLISH)).build();
     }
 
     @Override
@@ -122,7 +122,7 @@ private void addWidgetAsYAML(String id, String yaml) {
             // add a tag with the add-on ID to be able to identify the block library in the registry
             widget.addTag(id);
             blocksRegistry.add(widget);
-        } catch (IOException e) {
+        } catch (JacksonException e) {
             logger.error("Unable to parse YAML: {}", e.getMessage());
             throw new IllegalArgumentException("Unable to parse YAML");
         }

bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/CommunityTransformationAddonHandler.java

@@ -44,12 +44,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.google.gson.Gson;
 import com.google.gson.JsonParseException;
 
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.introspect.AnnotationIntrospectorPair;
+import tools.jackson.databind.introspect.JacksonAnnotationIntrospector;
+import tools.jackson.dataformat.yaml.YAMLMapper;
+
 /**
  * A {@link MarketplaceAddonHandler} implementation, which handles community provided transformations
  *
@@ -71,11 +74,11 @@ public CommunityTransformationAddonHandler(final @Reference StorageService stora
         this.storage = storageService.getStorage("org.openhab.marketplace.transformation",
                 this.getClass().getClassLoader());
 
-        this.yamlMapper = new ObjectMapper(new YAMLFactory());
-        yamlMapper.findAndRegisterModules();
-        this.yamlMapper.setDateFormat(new SimpleDateFormat("MMM d, yyyy, hh:mm:ss aa", Locale.ENGLISH));
-        yamlMapper.setAnnotationIntrospector(new AnnotationIntrospectorPair(new SerializedNameAnnotationIntrospector(),
-                yamlMapper.getSerializationConfig().getAnnotationIntrospector()));
+        this.yamlMapper = YAMLMapper.builder().findAndAddModules()
+                .defaultDateFormat(new SimpleDateFormat("MMM d, yyyy, hh:mm:ss aa", Locale.ENGLISH))
+                .annotationIntrospector(new AnnotationIntrospectorPair(new SerializedNameAnnotationIntrospector(),
+                        new JacksonAnnotationIntrospector()))
+                .build();
     }
 
     @Override
@@ -151,7 +154,7 @@ private PersistedTransformation addTransformationFromYAML(String id, String yaml
             PersistedTransformation transformation = yamlMapper.readValue(yaml, PersistedTransformation.class);
             storage.put(id, transformation);
             return transformation;
-        } catch (IOException e) {
+        } catch (JacksonException e) {
             logger.error("Unable to parse YAML: {}", e.getMessage());
             throw new IllegalArgumentException("Unable to parse YAML");
         }

bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/CommunityUIWidgetAddonHandler.java

@@ -37,9 +37,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.introspect.AnnotationIntrospectorPair;
+import tools.jackson.databind.introspect.JacksonAnnotationIntrospector;
+import tools.jackson.dataformat.yaml.YAMLMapper;
 
 /**
  * A {@link MarketplaceAddonHandler} implementation, which handles UI widgets as YAML files and installs
@@ -59,11 +61,11 @@ public class CommunityUIWidgetAddonHandler implements MarketplaceAddonHandler {
     @Activate
     public CommunityUIWidgetAddonHandler(final @Reference UIComponentRegistryFactory uiComponentRegistryFactory) {
         this.widgetRegistry = uiComponentRegistryFactory.getRegistry("ui:widget");
-        this.yamlMapper = new ObjectMapper(new YAMLFactory());
-        yamlMapper.findAndRegisterModules();
-        this.yamlMapper.setDateFormat(new SimpleDateFormat("MMM d, yyyy, hh:mm:ss aa", Locale.ENGLISH));
-        yamlMapper.setAnnotationIntrospector(new AnnotationIntrospectorPair(new SerializedNameAnnotationIntrospector(),
-                yamlMapper.getSerializationConfig().getAnnotationIntrospector()));
+        this.yamlMapper = YAMLMapper.builder().findAndAddModules()
+                .defaultDateFormat(new SimpleDateFormat("MMM d, yyyy, hh:mm:ss aa", Locale.ENGLISH))
+                .annotationIntrospector(new AnnotationIntrospectorPair(new SerializedNameAnnotationIntrospector(),
+                        new JacksonAnnotationIntrospector()))
+                .build();
     }
 
     @Override
@@ -124,7 +126,7 @@ private void addWidgetAsYAML(String id, String yaml) {
             // add a tag with the add-on ID to be able to identify the widget in the registry
             widget.addTag(id);
             widgetRegistry.add(widget);
-        } catch (IOException e) {
+        } catch (JacksonException e) {
             logger.error("Unable to parse YAML: {}", e.getMessage());
             throw new IllegalArgumentException("Unable to parse YAML");
         }

bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/SerializedNameAnnotationIntrospector.java

@@ -19,12 +19,14 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.AnnotationIntrospector;
-import com.fasterxml.jackson.databind.PropertyName;
-import com.fasterxml.jackson.databind.introspect.Annotated;
 import com.google.gson.annotations.SerializedName;
 
+import tools.jackson.core.Version;
+import tools.jackson.databind.AnnotationIntrospector;
+import tools.jackson.databind.PropertyName;
+import tools.jackson.databind.cfg.MapperConfig;
+import tools.jackson.databind.introspect.Annotated;
+
 /**
  * This is a {@link SerializedNameAnnotationIntrospector}, which processes SerializedName annotations.
  *
@@ -38,17 +40,17 @@ final class SerializedNameAnnotationIntrospector extends AnnotationIntrospector
 
     @Override
     @NonNullByDefault({})
-    public PropertyName findNameForDeserialization(Annotated annotated) {
+    public PropertyName findNameForDeserialization(MapperConfig<?> config, Annotated annotated) {
         return Optional.ofNullable(annotated.getAnnotation(SerializedName.class)).map(s -> new PropertyName(s.value()))
-                .orElseGet(() -> super.findNameForDeserialization(annotated));
+                .orElseGet(() -> super.findNameForDeserialization(config, annotated));
     }
 
     @Override
     @NonNullByDefault({})
-    public List<PropertyName> findPropertyAliases(Annotated annotated) {
+    public List<PropertyName> findPropertyAliases(MapperConfig<?> config, Annotated annotated) {
         return Optional.ofNullable(annotated.getAnnotation(SerializedName.class))
                 .map(s -> Stream.of(s.alternate()).map(PropertyName::new).toList())
-                .orElseGet(() -> super.findPropertyAliases(annotated));
+                .orElseGet(() -> super.findPropertyAliases(config, annotated));
     }
 
     @Override

bundles/org.openhab.core.automation/pom.xml

@@ -46,6 +46,12 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>tools.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-yaml</artifactId>
+      <version>${jackson.version}</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 
 </project>

bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/parser/jackson/AbstractJacksonYAMLParser.java

@@ -18,8 +18,8 @@
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.automation.parser.Parser;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.dataformat.yaml.YAMLMapper;
 
 /**
  * Abstract class that can be used by YAML parsers for the different entity types.
@@ -35,8 +35,7 @@ public abstract class AbstractJacksonYAMLParser<T> implements Parser<T> {
     protected static final ObjectMapper YAML_MAPPER;
 
     static {
-        YAML_MAPPER = new ObjectMapper(new YAMLFactory());
-        YAML_MAPPER.findAndRegisterModules();
+        YAML_MAPPER = YAMLMapper.builder().findAndAddModules().build();
     }
 
     @Override

bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/parser/jackson/TemplateYAMLParser.java

@@ -27,8 +27,8 @@
 import org.openhab.core.automation.template.Template;
 import org.osgi.service.component.annotations.Component;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
+import tools.jackson.core.type.TypeReference;
+import tools.jackson.databind.JsonNode;
 
 /**
  * This class can parse and serialize sets of {@link Template}s.

bundles/org.openhab.core.io.rest.swagger/src/main/java/org/openhab/core/io/rest/swagger/impl/OpenApiResource.java

@@ -41,10 +41,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-
-import io.swagger.v3.core.util.Json;
 import io.swagger.v3.jaxrs2.Reader;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Contact;
@@ -54,6 +50,9 @@
 import io.swagger.v3.oas.models.security.Scopes;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import io.swagger.v3.oas.models.servers.Server;
+import tools.jackson.core.JacksonException;
+import tools.jackson.core.type.TypeReference;
+import tools.jackson.databind.ObjectMapper;
 
 /**
  * An endpoint to generate and provide an OpenAPI description.
@@ -81,6 +80,7 @@ public class OpenApiResource implements RESTResource {
 
     private final Logger logger = LoggerFactory.getLogger(OpenApiResource.class);
     private final BundleContext bundleContext;
+    private final ObjectMapper objectMapper = new ObjectMapper();
 
     /**
      * Creates a new instance.
@@ -106,11 +106,11 @@ public Object getOpenAPI() {
             openAPI.setServers(List.of(createServer()));
             openAPI.schemaRequirement("oauth2", createOAuth2SecurityScheme());
 
-            String json = Json.mapper().writeValueAsString(openAPI);
+            String json = objectMapper.writeValueAsString(openAPI);
             return Response.status(Response.Status.OK)
-                    .entity(Json.mapper().readValue(json, new TypeReference<Map<String, Object>>() {
+                    .entity(objectMapper.readValue(json, new TypeReference<Map<String, Object>>() {
                     })).build();
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {
             logger.error("Error while serializing the OpenAPI object to JSON");
             return Response.serverError().build();
         } catch (InvalidSyntaxException e) {

bundles/org.openhab.core.io.websocket.audio/pom.xml

@@ -25,6 +25,12 @@
       <artifactId>org.openhab.core.io.websocket</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>tools.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>${jackson.version}</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 
 </project>