Merge branch 'refs/heads/master' into alternativeSubmitted

ivoa · Nov 7, 2024 · d1c6da1 · d1c6da1
2 parents 98fc5b5 + 211e920
commit d1c6da1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -26,7 +26,7 @@ jobs:
       with:
         submodules: true
 
-    - uses: gradle/wrapper-validation-action@v1
+    - uses: gradle/actions/setup-gradle@v4
 
     - name: Set up JDK 17
       uses: actions/setup-java@v4
@@ -62,7 +62,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Update the PDF preview
-      uses: Xotl/cool-github-releases@v1
+      uses: Xotl/cool-github-releases@v1.1.10
       with:
         mode: update
         isPrerelease: false

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -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
@@ -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!).
diff --git 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)