From 232d87c5b33ea30bd1b4a5f92e4917b2726ec4c8 Mon Sep 17 00:00:00 2001 From: Paul Harrison Date: Wed, 14 Aug 2024 16:48:16 +0100 Subject: [PATCH] publish 0.5.6 --- doc/guide/QuickStart.md | 2 +- doc/guide/modelling/TransformingToVODML.md | 6 +++++- doc/std/ivoatex | 2 +- models/ivoa/build.gradle.kts | 2 +- tools/ChangeLog.md | 4 +++- tools/gradletooling/TODO.md | 3 +++ tools/gradletooling/gradle-plugin/build.gradle.kts | 2 +- tools/gradletooling/sample/build.gradle.kts | 2 +- 8 files changed, 16 insertions(+), 7 deletions(-) diff --git a/doc/guide/QuickStart.md b/doc/guide/QuickStart.md index d169365b..cbc852a4 100644 --- a/doc/guide/QuickStart.md +++ b/doc/guide/QuickStart.md @@ -51,7 +51,7 @@ The various sub-properties that can be set are ``` will set the directory to be `vo-dml` * _vodmlFiles_ - this is set by default to be all the `*.vo-dml.xml` files in the vodmlDir, but can be individually overridden. -* _bindingFiles_ - the files that specify the mapping details between the models and the generated code. +* _bindingFiles_ - the files that specify the mapping details between the models and the generated code. _N.B._ there is no default for this setting - if generating code it must be specified. * _outputDocDir_ - where the generated documentation is created by the `gradle vodmlDoc` command- default `build/generated/docs/vodml/`. * _outputSiteDir_ - where the [mkdocs](https://www.mkdocs.org) suitable model description is created by the `gradle vodmlSite` command - default `build/generated/docs/vodml-site`. diff --git a/doc/guide/modelling/TransformingToVODML.md b/doc/guide/modelling/TransformingToVODML.md index cb940111..3c79f577 100644 --- a/doc/guide/modelling/TransformingToVODML.md +++ b/doc/guide/modelling/TransformingToVODML.md @@ -5,4 +5,8 @@ It is possible to start with an XML schema that can be transferred to VODSL with ```shell gradle vodmlXsdToVodsl --xsd mymodel.xsd --dsl mymodel.vodsl -``` \ No newline at end of file +``` + +The transformation does not cope with all of the "styles" XML schema that are possible, so that it is likely that +the generated VODSL will need further hand editing. + diff --git a/doc/std/ivoatex b/doc/std/ivoatex index c4a445a6..9fb38c82 160000 --- a/doc/std/ivoatex +++ b/doc/std/ivoatex @@ -1 +1 @@ -Subproject commit c4a445a6306248bd3cc7d61b3b5272f23943c9d1 +Subproject commit 9fb38c829bf1e72806e46baac521302999dd3f48 diff --git a/models/ivoa/build.gradle.kts b/models/ivoa/build.gradle.kts index ee2c11db..5cbed5a7 100644 --- a/models/ivoa/build.gradle.kts +++ b/models/ivoa/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("net.ivoa.vo-dml.vodmltools") version "0.5.5" + id("net.ivoa.vo-dml.vodmltools") version "0.5.6" // id ("com.diffplug.spotless") version "5.17.1" `maven-publish` id("io.github.gradle-nexus.publish-plugin") version "1.3.0" diff --git a/tools/ChangeLog.md b/tools/ChangeLog.md index 183399ef..072accc7 100644 --- a/tools/ChangeLog.md +++ b/tools/ChangeLog.md @@ -53,4 +53,6 @@ * add link hover tips to the site docs * add multiplicities to site diagrams (but not working in Safari on MacOS - see https://github.com/ivoa/vo-dml/issues/52) * 0.5.5 - * allow binding to specify eager fetching for JPA \ No newline at end of file + * allow binding to specify eager fetching for JPA +* 0.5.6 + * correct some file URIs for windows \ No newline at end of file diff --git a/tools/gradletooling/TODO.md b/tools/gradletooling/TODO.md index b9132a24..b01443e4 100644 --- a/tools/gradletooling/TODO.md +++ b/tools/gradletooling/TODO.md @@ -37,6 +37,8 @@ VODML Tooling TODO * Anything that might help in mapping to OPENAPI * idea of a "view" - eg. jobsummary in uws * OpenApi descriminators +* THE element is supposed to register specify an identifier by which it is registered - any IVOA std should be + in the standard namespace anyway - only use might be for arbitrary names - however this might be better done with "namespacing" of the model names... * STC * epoch - not really defined as something that is used properly @@ -93,6 +95,7 @@ VODML Tooling TODO * can do better with subsets in subtypes - if supertype is abstract then it is possible to define in a subtype and get better type safety. * https://stackoverflow.com/questions/60402092/jackson-custom-deserializer-for-polymorphic-objects-and-string-literals-as-defau and https://stackoverflow.com/questions/18313323/how-do-i-call-the-default-deserializer-from-a-custom-deserializer-in-jackson * problem with the "lifecycle" example that is not present in json serialization - the contained and referenced example is output twice + * check whether optional elements are output as Null when not specified or just absent - have consistent policy for this accross all areas... * JPA diff --git a/tools/gradletooling/gradle-plugin/build.gradle.kts b/tools/gradletooling/gradle-plugin/build.gradle.kts index 2a77e493..a31ca9ff 100644 --- a/tools/gradletooling/gradle-plugin/build.gradle.kts +++ b/tools/gradletooling/gradle-plugin/build.gradle.kts @@ -14,7 +14,7 @@ plugins { } group = "net.ivoa.vo-dml" -version = "0.5.5" +version = "0.5.6" repositories { mavenLocal() // FIXME remove this when releasing - just here to pick up local vodsl updates diff --git a/tools/gradletooling/sample/build.gradle.kts b/tools/gradletooling/sample/build.gradle.kts index 0f1d09d6..14ffe157 100644 --- a/tools/gradletooling/sample/build.gradle.kts +++ b/tools/gradletooling/sample/build.gradle.kts @@ -6,7 +6,7 @@ import ru.vyarus.gradle.plugin.python.task.PythonTask * */ plugins { - id("net.ivoa.vo-dml.vodmltools") version "0.5.5" + id("net.ivoa.vo-dml.vodmltools") version "0.5.6" id("com.diffplug.spotless") version "6.25.0" id("ru.vyarus.use-python") version "4.0.0"