diff --git a/binding_proposal_model.xml b/binding_proposal_model.xml
index d50006c..895598d 100644
--- a/binding_proposal_model.xml
+++ b/binding_proposal_model.xml
@@ -6,16 +6,20 @@
proposal
proposaldm.vo-dml.xmls
org.ivoa.dm.proposal.prop
-http://ivoa.net/dm/proposalDM
+http://ivoa.net/dm/proposalDM/v0.4
+
+ 3072
+
+
proposalManagement
proposalManagement.vo-dml.xml
org.ivoa.dm.proposal.management
- http://ivoa.net/dm/proposalManagment
+ http://ivoa.net/dm/proposalManagment/v0.4
diff --git a/build.gradle.kts b/build.gradle.kts
index d50ee81..e5eee6c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
import org.gradle.kotlin.dsl.accessors.runtime.addDependencyTo
plugins {
- id("net.ivoa.vo-dml.vodmltools") version "0.4.4"
+ id("net.ivoa.vo-dml.vodmltools") version "0.4.5"
`maven-publish`
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
signing
diff --git a/src/main/vo-dml/proposalManagement.vo-dml.xml b/src/main/vo-dml/proposalManagement.vo-dml.xml
index 28b3dff..a7562cf 100644
--- a/src/main/vo-dml/proposalManagement.vo-dml.xml
+++ b/src/main/vo-dml/proposalManagement.vo-dml.xml
@@ -6,7 +6,7 @@
proposalManagement
The data model for managing the proposal review process. Intended to work for phase 1
-
TBD
+
Paul Harrison
0.3
2023-12-19T15:37:41Z
diff --git a/src/main/vo-dml/proposaldm.vo-dml.xml b/src/main/vo-dml/proposaldm.vo-dml.xml
index 12cff64..059cc09 100644
--- a/src/main/vo-dml/proposaldm.vo-dml.xml
+++ b/src/main/vo-dml/proposaldm.vo-dml.xml
@@ -9,7 +9,7 @@
proposal to be reviewed and allocated time. It does not cover all the technical detail of instrument setup that would be needed to actually schedule the
observations, although the intention is that information about targets etc. could be automatically transferred to an observing system.
- TBD
+
Paul Harrison
0.3
2024-03-26T09:49:59Z
@@ -24,9 +24,12 @@
not known
- WikiDataId
- WikiDataId
- a WikiData identifier
+ WikiDataId
+ WikiDataId
+ a WikiData identifier
+
+ ivoa:stringIdentifier
+
ProposalKind
@@ -862,7 +865,7 @@
-
+
Target
Target
A target source
@@ -967,7 +970,7 @@
proposal:Target
-
+
Field
Field
Definition of an observing field pointing
@@ -1076,12 +1079,12 @@
-
+
ObservingConstraint
ObservingConstraint
a form of constraint on the observation
-
+
TimingConstraint
TimingConstraint
Any specific timing requirements for the observing
@@ -1153,7 +1156,7 @@
proposal:TimingConstraint
-
+
PointingConstaint
PointingConstaint
A constraint that limits the telescope pointing
@@ -1374,7 +1377,7 @@
-
+
Observation
Observation
diff --git a/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExampleTest.java b/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExampleTest.java
index c8ef77b..723ec56 100644
--- a/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExampleTest.java
+++ b/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExampleTest.java
@@ -117,7 +117,7 @@ public void testJacksonOjectIds( ) throws JsonProcessingException {
String njn = "{\n"
+ " \"members\": [\n"
+ " {\n"
- + " \"role\": \"CHAIR\",\n"
+ + " \"role\": \"Chair\",\n"
+ " \"member\": {\n"
+ " \"_id\": 1,\n"
+ " \"person\": {\n"
@@ -141,7 +141,7 @@ public void testJacksonOjectIds( ) throws JsonProcessingException {
+ " }\n"
+ " },\n"
+ " {\n"
- + " \"role\": \"SCIENCEREVIEWER\",\n"
+ + " \"role\": \"ScienceReviewer\",\n"
+ " \"member\": {\n"
+ " \"_id\": 2,\n"
+ " \"person\": {\n"