drop ivoa COORDS model dependency and replace with simpler definitions

build.gradle.kts

@@ -1,14 +1,14 @@
 
 plugins {
-        id("net.ivoa.vo-dml.vodmltools") version "0.5.28"
+        id("net.ivoa.vo-dml.vodmltools") version "0.5.31"
         `maven-publish`
 //        id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
         signing
-
+        id("com.diffplug.spotless") version "6.25.0"
 }
 
 group = "org.javastro.ivoa.dm"
-version = "0.6.6"
+version = "0.7.0-SNAPSHOT"
 
 
 vodml {
@@ -50,7 +50,23 @@ java {
         withSourcesJar()
 }
 
+spotless {
+        java {
+                target(vodml.outputJavaDir.asFileTree.matching(
+                        PatternSet().include("**/*.java")
+                ))
+                googleJavaFormat("1.17.0")
+        }
+}
+
+tasks.named("spotlessJava") {
+        dependsOn("vodmlJavaGenerate")
+}
 
+tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME) {
+        dependsOn("spotlessApply")
+}
+// end of spotless config
 
 //make the fact that sources are generated explicit (gets rid of warning that it will not work in gradle 8)- see https://melix.github.io/blog/2021/10/gradle-quickie-dependson.html
 tasks.named<Jar>("sourcesJar") {
@@ -111,7 +127,7 @@ tasks.withType<Jar> { duplicatesStrategy = DuplicatesStrategy.INCLUDE } //IMPL b
 
 dependencies {
         api("net.ivoa.vo-dml:ivoa-base:1.1-SNAPSHOT")
-        api("net.ivoa.dm:coordinateDM:1.1-SNAPSHOT")
+        api("net.ivoa.dm:ADQLGeomDM:0.9-SNAPSHOT")
 //    implementation("org.javastro:ivoa-entities:0.9.3-SNAPSHOT")
 
 //   annotationProcessor ("org.hibernate.orm:hibernate-processor:7.0.8.Final")

mkdocs_template.yml

@@ -1,5 +1,6 @@
 site_name: ProposalDM
 repo_url: 'https://github.com/ivoa/ProposalDM'
+docs_dir: docs/
 theme:
   name: material
   features:

settings.gradle.kts

@@ -17,7 +17,7 @@ dependencyResolutionManagement {
         will not be necessary when this library is released as a non-SNAPSHOT version.
          */
         maven {
-            url= uri("https://repo.dev.uksrc.org/repository/maven-snapshots/")
+            url= uri("https://repo.dev.uksrc.org/repository/maven-public/")
         }
     }
 }

src/main/vo-dml/proposalManagement.vo-dml.xml

@@ -8,23 +8,23 @@
       <uri/>
       <title>Proposal Management</title>
       <author>Paul Harrison</author>
-      <version>0.6</version>
-      <lastModified>2025-07-28T16:57:00Z</lastModified>
+      <version>0.7</version>
+      <lastModified>2026-03-13T11:34:58Z</lastModified>
       <import>
         <name>ivoa</name>
         <version>1.1</version>
         <url>IVOA-v1.0.vo-dml.xml</url>
         <documentationURL>not known</documentationURL>
       </import>
       <import>
-        <name>coords</name>
-        <version>1.1</version>
-        <url>Coords-v1.0.vo-dml.xml</url>
+        <name>adqlgeom</name>
+        <version>1.0</version>
+        <url>ADQLGeomDM-v1.vo-dml.xml</url>
         <documentationURL>not known</documentationURL>
       </import>
       <import>
         <name>proposal</name>
-        <version>0.6</version>
+        <version>0.7</version>
         <url>proposaldm.vo-dml.xml</url>
         <documentationURL>not known</documentationURL>
       </import>
@@ -172,7 +172,7 @@
                  <name>location</name>
                  <description>the location of the telescope</description>	    
                  <datatype>
-                    <vodml-ref>coords:CartesianPoint</vodml-ref>
+                    <vodml-ref>proposal:coords.CartesianPoint</vodml-ref>
                  </datatype>
                  <multiplicity>
                    <minOccurs>1</minOccurs>