Merge branch '2.12' into 2.13

Author: cowtowncoder

guava/README.md

@@ -12,24 +12,38 @@ To use module on Maven-based projects, use following dependency:
 <dependency>
   <groupId>com.fasterxml.jackson.datatype</groupId>
   <artifactId>jackson-datatype-guava</artifactId>
-  <version>2.11.1</version>
+  <version>2.12.1</version>
 </dependency>
 ```
 
 (or whatever version is most up-to-date at the moment)
 
 ### Guava compatibility
 
-Jackson 2.x versions up to and including 2.11.x:
+Although specific version of this module is built against particular Guava library version,
+and similarly defines dependency to just that version, module itself works against wider
+range of Guava versions.
 
-* Should work on Guava versions `15.0` and later (currently up to 29.0-jre)
-* Require Guava version `20.0` or later to build (some tests depend on newer versions for verification)
+Following table shows the tested working ranges for recent module versions.
 
-Minimum supported version is likely to be increased for Jackson 2.12 or later.
+| Module version | Min Guava | Default Guava | Max Guava |
+| -------------- | --------- | ------------- | --------- |
+| 2.12           | 14.0      | 21.0          | 29.0-jre  |
+| 2.11           | 14.0      | 20.0          | 29.0-jre  |
+| 2.10           | 14.0      | 20.0          | 29.0-jre  |
+| 2.9            | 12.0      | 18.0          | 29.0-jre  |
+
+Notes:
+
+* At the point of testing, `29.0-jre` was the latest available Guava library
+version, so all versions work with the latest Guava
+* "Min Guava" means the earliest version that integration tests passed with
+* "Default Guava" is the dependency specified in module's `pom.xml`: it is used for build, unit tests
+    * note: building, unit tests work on a range but typically require higher version than "Min Guava"
 
 ### Registering module
 
-Like all standard Jackson modules (libraries that implement Module interface), registration is done as follows:
+Like all standard Jackson modules (libraries that implement Module interface), registration is done as follows (Jackson 2.x up to 2.9)
 
 ```java
 // New (2.10+)
@@ -42,7 +56,15 @@ ObjectMapper mapper = new ObjectMapper()
     .registerModule(new GuavaModule());
 ```
 
-after which functionality is available for all normal Jackson operations.
+OR, the new method added in 2.10 (old method will work with 2.x but not 3.x):
+
+```java
+ObjectMapper mapper = JsonMapper.builder()
+    .addModule(new GuavaModule())
+    .build();
+```
+
+after which functionality is available with all normal Jackson operations.
 
 ### Configuration
 

guava/src/test/java/com/fasterxml/jackson/datatype/guava/TestImmutables.java

@@ -55,6 +55,14 @@ public void testWithoutSerializers() throws Exception
         ImmutableMap<String,Integer> map = ImmutableMap.<String,Integer>builder()
             .put("a", 1).put("b", 2).build();
         assertEquals("{\"a\":1,\"b\":2}", MAPPER.writeValueAsString(map));
+
+        assertEquals(a2q("{'message':'Hello, world!'}"),
+                MAPPER.writeValueAsString(ImmutableMap.of("message", "Hello, world!")));
+        assertEquals(a2q("{'id':3,'name':'Bob'}"),
+                MAPPER.writeValueAsString(ImmutableMap.of("id", 3, "name", "Bob")));
+
+        assertEquals("[12,true,0.25]",
+                MAPPER.writeValueAsString(ImmutableList.of(12, true, 0.25)));
     }
 
     /**

release-notes/VERSION-2.x

@@ -20,7 +20,7 @@ Active Maintainers:
 
 No changes since 2.12
 
-2.12.2 (not yet released)
+2.12.2 (03-Mar-2021)
 
 - Add missing "provides Module" for eclipse-collections module-info (JPMS)