Merge branch '2.x' into 3.x

Author: cowtowncoder

cbor/README.md

@@ -32,7 +32,7 @@ To use this extension on Maven-based projects, use following dependency:
 <dependency>
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformat-cbor</artifactId>
-  <version>2.16.0</version>
+  <version>2.20.0</version>
 </dependency>
 ```
 
@@ -41,7 +41,7 @@ To use this extension on Maven-based projects, use following dependency:
 ## Usage
 
 Basic usage is by using `CBORFactory` in places where you would usually use `JsonFactory`
-(or `CBORFactory` instead `JsonMapper`/`ObjectMapper`)
+(or `CBORMapper` instead `JsonMapper`/`ObjectMapper`)
 
 ```java
 ObjectMapper mapper = new CBORMapper();

release-notes/VERSION-2.x

@@ -14,7 +14,11 @@ Active maintainers:
 === Releases ===
 ------------------------------------------------------------------------
 
-2.20.0-rc1 (04-Aug-2025)
+2.21.0 (not yet released)
+
+No changes since 2.20
+
+2.20.0 (28-Aug-2025)
 
 #137: (cbor) Allow exposing CBOR "undefined" value as `JsonToken.VALUE_EMBEDDED_OBJECT`;
   with embedded value of `null`