diff --git a/build.gradle.kts b/build.gradle.kts index 1eef576..bef1d8f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("net.ivoa.vo-dml.vodmltools") version "0.5.9" + id("net.ivoa.vo-dml.vodmltools") version "0.5.10" `maven-publish` id("io.github.gradle-nexus.publish-plugin") version "1.1.0" signing @@ -44,7 +44,7 @@ tasks.named("vodmlSite") { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) // moved to Java 11 + languageVersion.set(JavaLanguageVersion.of(17)) // moved to Java 17 } withJavadocJar() withSourcesJar() diff --git a/docs/code.md b/docs/code.md index 60c3ccc..fcfd4f8 100644 --- a/docs/code.md +++ b/docs/code.md @@ -28,7 +28,7 @@ then the maven "coordinates" for the model library are * *version* ![Maven metadata URL](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Foss.sonatype.org%2Fcontent%2Frepositories%2Fsnapshots%2Forg%2Fjavastro%2Fivoa%2Fdm%2Fproposaldm%2Fmaven-metadata.xml). -The [JavaDoc](generated/javadoc/index.html) describe the code in detail, but it is worth reading the generic description of the patterns in the [java generated from VO-DML tools](https://ivoa.github.io/vo-dml/JavaCodeGeneration/#characteristics-of-the-generated-code) as that will combined with the autogenerated model documentation will probably help comprehension more quickly than just relying on the javadoc. +The [JavaDoc](generated/javadoc/index.html) describe the code in detail, but it is worth reading the generic description of the patterns in the [java generated from VO-DML tools](https://ivoa.github.io/vo-dml/JavaCodeGeneration/#characteristics-of-the-generated-code) as that, combined with the autogenerated model documentation, will probably help comprehension more quickly than just relying on the javadoc. ## Schema There are [schema](./schema.md) that can be used to validate instances of the model created either with the standard code - or perhaps more usefully as interchange with other code (as the standard code is guaranteed to produce valid instances!). \ No newline at end of file diff --git a/src/test/java/org/ivoa/dm/proposal/prop/BaseExample.java b/src/test/java/org/ivoa/dm/proposal/prop/BaseExample.java index a7bca74..e9dfec9 100644 --- a/src/test/java/org/ivoa/dm/proposal/prop/BaseExample.java +++ b/src/test/java/org/ivoa/dm/proposal/prop/BaseExample.java @@ -30,9 +30,9 @@ public abstract class BaseExample { /** SPACE_SYS. */ - protected final SpaceSys GEO_SYS = new SpaceSys(new CartesianCoordSpace(),new SpaceFrame(new StdRefLocation("TOPOCENTRE"), "ICRF", null, ""));//FIXME - this should really define the frame better - STC coords library should have some standard model instances... + protected final SpaceSys GEO_SYS = new SpaceSys(new CartesianCoordSpace(),new SpaceFrame(new StdRefLocation("TOPOCENTER"), "ICRS", null, ""));//FIXME - this should really define the frame better - STC coords library should have some standard model instances... - protected final SpaceSys ICRS_SYS = new SpaceSys(new CartesianCoordSpace(),new SpaceFrame(new StdRefLocation("TOPOCENTRE"), "ICRS", null, ""));//FIXME - this should really define the frame better - STC coords library should have some standard model instances... + protected final SpaceSys ICRS_SYS = new SpaceSys(new CartesianCoordSpace(),new SpaceFrame(new StdRefLocation("TOPOCENTER"), "ICRS", null, ""));//FIXME - this should really define the frame better - STC coords library should have some standard model instances... protected final Organization[] institutes = { new Organization("org", "org address",new Ivorn("ivo://org/anorg"), null),//TODO is null same as not setting? new Organization("org2", "org2 address",new Ivorn("ivo://org/org2"), null)