Merge remote-tracking branch 'origin/main' into release/6.1

Author: matthewelwell

pom.xml

@@ -6,7 +6,11 @@
 
   <groupId>com.flagsmith</groupId>
   <artifactId>flagsmith-java-client</artifactId>
+<<<<<<< HEAD
   <version>6.1.0</version>
+=======
+  <version>6.0.1</version>
+>>>>>>> origin/main
   <packaging>jar</packaging>
 
   <name>Flagsmith Java Client</name>
@@ -41,7 +45,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <java.version>1.11</java.version>
-    <jacksonVersion>2.13.5</jacksonVersion>
+    <jacksonVersion>2.14.2</jacksonVersion>
     <lombok.version>1.18.22</lombok.version>
     <slf4j.version>1.7.30</slf4j.version>
     <maven.checkstyle.version>3.1.0</maven.checkstyle.version>