commit f066d84ffb7fe2eb0dc3b7e7cd0d0417a1ae7963
author Jens Geyer <jensg@apache.org> Mon Jun 13 23:37:25 2022 +0200
committer Jens Geyer <jensg@apache.org> Mon Sep 05 22:04:22 2022 +0200
tree d47baa7d0dea62a354eb0ededf77715d6cf7aa33
parent 3f4fa2947dc6e049e0f4748bdb6142b0c4673164

Replace ThriftTest.thrift with v0.16/ThriftTest.thrift to allow for merging the partially completed uuid implementation to master

lib/json/schema.json

diff --git a/lib/json/schema.json b/lib/json/schema.json
index d058a7c..90bb7a5 100644
--- a/lib/json/schema.json
+++ b/lib/json/schema.json
@@ -22,7 +22,8 @@
         "map",
         "union",
         "struct",
-        "binary"
+        "binary",
+        "uuid"
       ]
     },
     "base-type": {
@@ -30,7 +31,7 @@
       "type": "object",
       "properties": {
         "typeId": {
-          "enum": ["void", "string", "bool", "byte", "i8", "i16", "i32", "i64", "double", "binary" ]
+          "enum": ["void", "string", "bool", "byte", "i8", "i16", "i32", "i64", "double", "binary", "uuid" ]
         }
       },
       "required": [ "typeId" ]

lib/json/test/build.xml

diff --git a/lib/json/test/build.xml b/lib/json/test/build.xml
index eb39c4f..a1f41f1 100644
--- a/lib/json/test/build.xml
+++ b/lib/json/test/build.xml
@@ -70,7 +70,7 @@
     <exec executable="${thrift.compiler}" failonerror="true">
       <arg line="--gen json"/>
       <arg line="-out ${gen.json.dir}"/>
-      <arg line="${thrift.test.dir}/ThriftTest.thrift"/>
+      <arg line="${thrift.test.dir}/v0.16/ThriftTest.thrift"/>
     </exec>
     <exec executable="${thrift.compiler}" failonerror="true">
       <arg line="--gen json:merge"/>