diff --git a/models/ivoa/build.gradle.kts b/models/ivoa/build.gradle.kts index 5cbed5a7..a39012fc 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.6" + id("net.ivoa.vo-dml.vodmltools") version "0.5.7" // id ("com.diffplug.spotless") version "5.17.1" `maven-publish` id("io.github.gradle-nexus.publish-plugin") version "1.3.0" diff --git a/runtime/java/build.gradle.kts b/runtime/java/build.gradle.kts index 6c86c05f..e6d6d5e2 100644 --- a/runtime/java/build.gradle.kts +++ b/runtime/java/build.gradle.kts @@ -6,7 +6,7 @@ plugins { signing } group = "org.javastro.ivoa.vo-dml" -version = "0.7.1" +version = "0.7.2" dependencies { @@ -15,7 +15,7 @@ dependencies { implementation("jakarta.xml.bind:jakarta.xml.bind-api:4.0.0") // implementation("org.glassfish.jaxb:jaxb-runtime:2.3.6") implementation("jakarta.persistence:jakarta.persistence-api:3.1.0") - implementation("com.fasterxml.jackson.core:jackson-databind:2.15.1") + implementation("com.fasterxml.jackson.core:jackson-databind:2.17.0") implementation("org.hibernate.orm:hibernate-core:6.2.7.Final") implementation("org.slf4j:slf4j-api:1.7.36") @@ -40,12 +40,16 @@ dependencies { //} java { -// modularity.inferModulePath.set(false) // still can only build on java 1.8 toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion = JavaLanguageVersion.of(17) } withJavadocJar() withSourcesJar() + +} + +tasks.javadoc { + (options as StandardJavadocDocletOptions).tags("TODO","IMPL") } tasks.test { @@ -110,6 +114,9 @@ publishing.publications.withType(MavenPublication::class.java).forEach { publica } } println ("java property skipSigning= " + project.hasProperty("skipSigning")) +repositories { + mavenCentral() +} signing { diff --git a/tools/ChangeLog.md b/tools/ChangeLog.md index 072accc7..3a53429a 100644 --- a/tools/ChangeLog.md +++ b/tools/ChangeLog.md @@ -55,4 +55,7 @@ * 0.5.5 * allow binding to specify eager fetching for JPA * 0.5.6 - * correct some file URIs for windows \ No newline at end of file + * correct some file URIs for windows +* 0.5.7 + * Added support for validation against IVOA vocabularies + * Added support for rdb serialization of primitive attributes with unbounded multiplicity as colon separated string \ No newline at end of file diff --git a/tools/gradletooling/TODO.md b/tools/gradletooling/TODO.md index b01443e4..8f5fab8f 100644 --- a/tools/gradletooling/TODO.md +++ b/tools/gradletooling/TODO.md @@ -83,6 +83,9 @@ VODML Tooling TODO * before and after serialization, the references need to be processed - it would be nice to do this automatically.... e.g. https://github.com/FasterXML/jackson-databind/issues/279 for jackson. * references * would be nice if the tooling warned when contained references are created bare.... - e.g. the filters in the original sample. +* Vocabularies + * would be good to add in off-line capability - store the desise at generation time and read that if the on-line not accessible + * only does run-time checking - perhaps compile-time would be good? * JAXB * ~~idrefs referred to objects are not being output - http://stackoverflow.com/questions/12914382/marshalling-unmarshalling-fields-to-tag-with-attributes-using-jaxb~~ * make the subsets create substitution group xml (i.e. have elements rather than xsi:type) http://blog.bdoughan.com/2010/11/jaxb-and-inheritance-using-substitution.html @@ -116,6 +119,7 @@ VODML Tooling TODO * JSON * allow refs to be serialized/deserialized as ids always.... - for use in APIs.... https://stackoverflow.com/questions/51172496/how-to-dynamically-ignore-a-property-on-jackson-serialization * perhaps have custom written ivoa base schema.... express some better rules... e.g. non neg integer... + * modern usage https://blogs.oracle.com/javamagazine/post/java-json-serialization-jackson # Python production diff --git a/tools/gradletooling/gradle-plugin/build.gradle.kts b/tools/gradletooling/gradle-plugin/build.gradle.kts index a31ca9ff..b07dab6e 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.6" +version = "0.5.7" repositories { mavenLocal() // FIXME remove this when releasing - just here to pick up local vodsl updates @@ -73,10 +73,11 @@ gradlePlugin { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(11))//NB needs to stay at 11 for gradle plugin ATM + languageVersion =JavaLanguageVersion.of(17) } } + sourceSets { main { // slightly complex way of adding the xslt and xsd directories to resources (they are at different levels) diff --git a/tools/gradletooling/gradle-plugin/src/main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlGradlePlugin.kt b/tools/gradletooling/gradle-plugin/src/main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlGradlePlugin.kt index e8537e7f..ed5313e0 100644 --- a/tools/gradletooling/gradle-plugin/src/main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlGradlePlugin.kt +++ b/tools/gradletooling/gradle-plugin/src/main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlGradlePlugin.kt @@ -159,7 +159,7 @@ class VodmlGradlePlugin: Plugin { //add the dependencies for JAXB and JPA - using the hibernate implementation - listOf("org.javastro.ivoa.vo-dml:vodml-runtime:0.7.1", + listOf("org.javastro.ivoa.vo-dml:vodml-runtime:0.7.2", "jakarta.xml.bind:jakarta.xml.bind-api:4.0.0", "org.glassfish.jaxb:jaxb-runtime:4.0.2", // "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.10", // supports JPA 2.2 diff --git a/tools/gradletooling/sample/build.gradle.kts b/tools/gradletooling/sample/build.gradle.kts index 14ffe157..d05249f6 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.6" + id("net.ivoa.vo-dml.vodmltools") version "0.5.7" id("com.diffplug.spotless") version "6.25.0" id("ru.vyarus.use-python") version "4.0.0"