Merge branch '8.1.x' into master by rayokota

Author: semaphore-agent-production[bot]

json-schema-provider/src/main/java/io/confluent/kafka/schemaregistry/json/JsonSchemaUtils.java

@@ -213,6 +213,9 @@ public static JsonSchema getSchema(
       case DRAFT_2019_09:
         draft = JsonSchemaDraft.DRAFT_2019_09;
         break;
+      case DRAFT_2020_12:
+        draft = JsonSchemaDraft.DRAFT_2020_12;
+        break;
       default:
         draft = JsonSchemaDraft.DRAFT_07;
         break;

json-schema-provider/src/test/java/io/confluent/kafka/schemaregistry/json/JsonSchemaTest.java

@@ -360,6 +360,18 @@ public void testSchemaWithDraft4() throws Exception {
     assertEquals(expected, actual);
   }
 
+  @Test
+  public void testSchemaWithDraft_2020_12() throws Exception {
+    TestObj testObj = new TestObj();
+    String actual =
+        JsonSchemaUtils.getSchema(testObj, SpecificationVersion.DRAFT_2020_12, true, null).toString();
+    String expected = "{\"$schema\":\"http://json-schema.org/draft/2020-12/schema#\","
+        + "\"title\":\"Test Obj\",\"type\":\"object\",\"additionalProperties\":false,"
+        + "\"properties\":{\"prop\":{\"oneOf\":[{\"type\":\"null\",\"title\":\"Not included\"},"
+        + "{\"type\":\"string\"}]}}}";
+    assertEquals(expected, actual);
+  }
+
   @Test
   public void testSchemaWithPackageScan() throws Exception {
     TestObj testObj = new TestObj();