update to vodml-tools 0.5.13

ivoa · Dec 19, 2024 · 1bd5a67 · 1bd5a67
1 parent c4a1b65
commit 1bd5a67
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 12 deletions.
diff --git a/binding_proposal_model.xml b/binding_proposal_model.xml
@@ -7,6 +7,7 @@
 <file>proposaldm.vo-dml.xml</file>s
     <java-package>org.ivoa.dm.proposal.prop</java-package>
 <xml-targetnamespace prefix="prop">http://ivoa.net/dm/proposalDM/v0.6</xml-targetnamespace>
+    <xml compositionStyle="unwrapped"/>
     <rdb inheritance-strategy="single-table"
          discriminatorColumnLength="64"/>
     <type-detail vodml-id="Justification.text">
@@ -20,6 +21,7 @@
     <file>proposalManagement.vo-dml.xml</file>
     <java-package>org.ivoa.dm.proposal.management</java-package>
     <xml-targetnamespace prefix="propm" >http://ivoa.net/dm/proposalManagment/v0.6</xml-targetnamespace>
+        <xml compositionStyle="unwrapped"/>
         <rdb inheritance-strategy="single-table"
              discriminatorColumnLength="64"/>
     </model>

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 
 plugins {
-        id("net.ivoa.vo-dml.vodmltools") version "0.5.12"
+        id("net.ivoa.vo-dml.vodmltools") version "0.5.13"
         `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
@@ -9,19 +9,22 @@
       <title>Proposal Management</title>
       <author>Paul Harrison</author>
       <version>0.6</version>
-      <lastModified>2024-11-18T20:47:38Z</lastModified>
+      <lastModified>2024-11-25T16:59:10Z</lastModified>
       <import>
-        <name>null</name><!--should not be needed in modern vo-dml -->
+        <name>ivoa</name>
+        <version>1.1</version>
         <url>IVOA-v1.0.vo-dml.xml</url>
         <documentationURL>not known</documentationURL>
       </import>
       <import>
-        <name>null</name><!--should not be needed in modern vo-dml -->
+        <name>coords</name>
+        <version>1.1</version>
         <url>Coords-v1.0.vo-dml.xml</url>
         <documentationURL>not known</documentationURL>
       </import>
       <import>
-        <name>null</name><!--should not be needed in modern vo-dml -->
+        <name>proposal</name>
+        <version>0.6</version>
         <url>proposaldm.vo-dml.xml</url>
         <documentationURL>not known</documentationURL>
       </import>

diff --git a/src/main/vo-dml/proposaldm.vo-dml.xml b/src/main/vo-dml/proposaldm.vo-dml.xml
@@ -12,14 +12,16 @@
       <title>Proposal</title>
       <author>Paul Harrison</author>
       <version>0.6</version>
-      <lastModified>2024-11-19T14:08:21Z</lastModified>
+      <lastModified>2024-12-17T15:39:16Z</lastModified>
       <import>
-        <name>null</name><!--should not be needed in modern vo-dml -->
+        <name>ivoa</name>
+        <version>1.1</version>
         <url>IVOA-v1.0.vo-dml.xml</url>
         <documentationURL>not known</documentationURL>
       </import>
       <import>
-        <name>null</name><!--should not be needed in modern vo-dml -->
+        <name>coords</name>
+        <version>1.1</version>
         <url>Coords-v1.0.vo-dml.xml</url>
         <documentationURL>not known</documentationURL>
       </import>

diff --git a/src/test/java/org/ivoa/dm/proposal/prop/AbstractProposalTest.java b/src/test/java/org/ivoa/dm/proposal/prop/AbstractProposalTest.java
@@ -143,7 +143,7 @@ void reviewJaxbTest() throws JAXBException,
 
     @org.junit.jupiter.api.Test
     void reviewDmJPATest() {
-        jakarta.persistence.EntityManager em = setupH2Db(ProposalModel.pu_name());
+        jakarta.persistence.EntityManager em = setupH2Db(ProposalManagementModel.pu_name());
         em.getTransaction().begin();
         ProposalManagementModel model = new ProposalManagementModel();
         final  ProposalCycle cycle = doTacWork();

diff --git a/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExampleTest.java b/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExampleTest.java
@@ -178,7 +178,7 @@ public void testJacksonOjectIds( ) throws JsonProcessingException {
    @org.junit.jupiter.api.Test
    public  void testDbQuery() throws JsonProcessingException {
 
-      jakarta.persistence.EntityManager em = setupH2Db(ProposalModel.pu_name());
+      jakarta.persistence.EntityManager em = setupH2Db(ProposalManagementModel.pu_name());
       em.getTransaction().begin();
 
       final ProposalCycle cycle = ex.getCycle();
@@ -196,7 +196,7 @@ public  void testDbQuery() throws JsonProcessingException {
    @org.junit.jupiter.api.Test
    public  void testDbDelete() throws JsonProcessingException {
 
-      jakarta.persistence.EntityManager em = setupH2Db(ProposalModel.pu_name());
+      jakarta.persistence.EntityManager em = setupH2Db(ProposalManagementModel.pu_name());
       em.getTransaction().begin();
 
       final ProposalCycle cycle = ex.getCycle();

diff --git a/std/ivoatex b/std/ivoatex
+24 −7		Makefile
+6 −3		github_workflow_build.yml.template
+34 −27		github_workflow_preview.yml.template