Merge branch '2.x' into 3.x

Author: cowtowncoder

afterburner/src/test/java/module-info.java

@@ -41,6 +41,7 @@
     opens tools.jackson.module.afterburner.ser.filter;
     opens tools.jackson.module.afterburner.testutil;
     opens tools.jackson.module.afterburner.testutil.failure;
+    opens tools.jackson.module.afterburner.tofix;
     opens tools.jackson.module.afterburner.util;
 
     provides tools.jackson.databind.JacksonModule with

afterburner/src/test/java/tools/jackson/module/afterburner/tofix/AfterburnerGenericInterface314Test.java

@@ -0,0 +1,40 @@
+package tools.jackson.module.afterburner.tofix;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.module.afterburner.AfterburnerTestBase;
+import tools.jackson.module.afterburner.testutil.failure.JacksonTestFailureExpected;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+// Reported as: https://github.com/FasterXML/jackson-modules-base/issues/314
+// but does not seem to fail as expected
+public class AfterburnerGenericInterface314Test extends AfterburnerTestBase
+{
+    interface A314<T> {
+        T getBody();
+    }
+
+    static class MD314 implements A314<String> {
+        private String body;
+
+        public MD314(String b) {
+            body = b;
+        }
+
+        @Override
+        public String getBody() {
+            return body;
+        }
+    }
+
+    //@JacksonTestFailureExpected
+    @Test
+    public void testMapperAfterUse() throws Exception
+    {
+        final ObjectMapper mapper = newAfterburnerMapper();
+        String json = mapper.writeValueAsString(new MD314("test"));
+        assertEquals("{\"body\":\"test\"}", json);
+    }
+}

blackbird/src/main/resources/META-INF/LICENSE

@@ -1,4 +1,4 @@
-This copy of Jackson JSON processor `jackson-module-afterburner` module is licensed under the
+This copy of Jackson JSON processor `jackson-module-blackbird` module is licensed under the
 Apache (Software) License, version 2.0 ("the License").
 See the License for details about distribution rights, and the
 specific rights regarding derivative works.