Merge branch '2.16' into 2.17

FasterXML · Dec 16, 2023 · 6a3771f · 6a3771f
2 parents 248ff8b + 60e6941
commit 6a3771f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/ProviderBase.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/base/ProviderBase.java
@@ -12,11 +12,11 @@
 import com.fasterxml.jackson.core.*;
 
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.util.LRUMap;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 
 import com.fasterxml.jackson.jaxrs.cfg.*;
 import com.fasterxml.jackson.jaxrs.util.ClassKey;
-import com.fasterxml.jackson.jaxrs.util.LRUMap;
 
 public abstract class ProviderBase<
     THIS extends ProviderBase<THIS, MAPPER, EP_CONFIG, MAPPER_CONFIG>,

diff --git a/base/src/main/java/com/fasterxml/jackson/jaxrs/util/LRUMap.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/util/LRUMap.java
@@ -3,11 +3,15 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+// TO BE REMOVED FROM JACKSON 2.18 or later
 /**
  * Helper for simple bounded LRU maps used for reusing lookup values.
  *
  * @since 2.2
+ *
+ * @deprecated Since 2.16.1 Use one from {@code jackson-databind} instead.
  */
+@Deprecated // since 2.16.1
 @SuppressWarnings("serial")
 public class LRUMap<K,V> extends LinkedHashMap<K,V>
 {
@@ -24,5 +28,4 @@ protected boolean removeEldestEntry(Map.Entry<K,V> eldest)
     {
         return size() > _maxEntries;
     }
-
 }
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -14,6 +14,10 @@ Sub-modules:
 
 -
 
+2.16.1 (not yet released)
+
+#178: Deprecate local `LRUMap`, use `jackson-databind` provided one instead
+
 2.16.0 (15-Nov-2023)
 
 No changes since 2.15