Merge branch '2.17' into 2.18

FasterXML · Apr 5, 2024 · 1eda007 · 1eda007
2 parents c40c204 + f81ffc2
commit 1eda007
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/cbor/src/main/java/com/fasterxml/jackson/jaxrs/cbor/CBORMapperConfigurator.java b/cbor/src/main/java/com/fasterxml/jackson/jaxrs/cbor/CBORMapperConfigurator.java
@@ -18,7 +18,7 @@
 public class CBORMapperConfigurator
     extends MapperConfiguratorBase<CBORMapperConfigurator, ObjectMapper>
 {
-    // @since 2.18
+    // @since 2.17.1
     private final ReentrantLock _lock = new ReentrantLock();
 
     /*

diff --git a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonMapperConfigurator.java b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonMapperConfigurator.java
@@ -17,7 +17,7 @@
 public class JsonMapperConfigurator
     extends MapperConfiguratorBase<JsonMapperConfigurator, ObjectMapper>
 {
-    // @since 2.18
+    // @since 2.17.1
     private final ReentrantLock _lock = new ReentrantLock();
 
     /*

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -12,6 +12,10 @@ Sub-modules:
 
 2.18.0 (not yet released)
 
+No changes since 2.17
+
+2.17.1 (not yet released)
+
 #184: Use `ReentrantLock`s instead of synchronized blocks
  (contributed by @pjfanning)
 

diff --git a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/SmileMapperConfigurator.java b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/SmileMapperConfigurator.java
@@ -19,7 +19,7 @@
 public class SmileMapperConfigurator
     extends MapperConfiguratorBase<SmileMapperConfigurator, ObjectMapper>
 {
-    // @since 2.18
+    // @since 2.17.1
     private final ReentrantLock _lock = new ReentrantLock();
 
     /*

diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/XMLMapperConfigurator.java b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/XMLMapperConfigurator.java
@@ -21,7 +21,7 @@
 public class XMLMapperConfigurator
     extends MapperConfiguratorBase<XMLMapperConfigurator, XmlMapper>
 {
-    // @since 2.18
+    // @since 2.17.1
     private final ReentrantLock _lock = new ReentrantLock();
 
     /*

diff --git a/yaml/src/main/java/com/fasterxml/jackson/jaxrs/yaml/YAMLMapperConfigurator.java b/yaml/src/main/java/com/fasterxml/jackson/jaxrs/yaml/YAMLMapperConfigurator.java
@@ -18,7 +18,7 @@
 public class YAMLMapperConfigurator
     extends MapperConfiguratorBase<YAMLMapperConfigurator, YAMLMapper>
 {
-    // @since 2.18
+    // @since 2.17.1
     private final ReentrantLock _lock = new ReentrantLock();
 
     /*