update to jakarta

ivoa · Aug 14, 2023 · 8d16f27 · 8d16f27
1 parent af512b7
commit 8d16f27
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,14 +1,14 @@
 import org.gradle.kotlin.dsl.accessors.runtime.addDependencyTo
 
 plugins {
-        id("net.ivoa.vo-dml.vodmltools") version "0.3.24"
+        id("net.ivoa.vo-dml.vodmltools") version "0.4.0"
         `maven-publish`
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
         signing
 }
 
 group = "org.javastro.ivoa.dm"
-version = "0.3.3-SNAPSHOT"
+version = "0.4.0-SNAPSHOT"
 
 
 vodml {

diff --git a/src/test/java/org/ivoa/dm/proposal/prop/AbstractProposalTest.java b/src/test/java/org/ivoa/dm/proposal/prop/AbstractProposalTest.java
@@ -13,7 +13,7 @@
 
 import java.util.List;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
@@ -96,7 +96,7 @@ void proposalDmJPATest() {
 
     }
     protected ObservingProposal propDbInOut() {
-        javax.persistence.EntityManager em = setupH2Db(ProposalModel.pu_name());
+        jakarta.persistence.EntityManager em = setupH2Db(ProposalModel.pu_name());
         em.getTransaction().begin();
         final ObservingProposal proposal = ex.getProposal();
         proposal.persistRefs(em);
@@ -142,7 +142,7 @@ void reviewJaxbTest() throws JAXBException,
 
     @org.junit.jupiter.api.Test
     void reviewDmJPATest() {
-        javax.persistence.EntityManager em = setupH2Db(ProposalModel.pu_name());
+        jakarta.persistence.EntityManager em = setupH2Db(ProposalModel.pu_name());
         em.getTransaction().begin();
 
         final ProposalCycle cycle = ex.getCycle();

diff --git a/src/test/java/org/ivoa/dm/proposal/prop/DataGenerator.java b/src/test/java/org/ivoa/dm/proposal/prop/DataGenerator.java
@@ -6,9 +6,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 /**
  * Creates some test data that can be imported via sql.

diff --git a/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExampleTest.java b/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExampleTest.java
@@ -52,7 +52,7 @@ public  void testObservations() {
      @org.junit.jupiter.api.Test 
    public  void testDbCreate() {
 
-        javax.persistence.EntityManager em = setupH2Db(ProposalModel.pu_name());
+        jakarta.persistence.EntityManager em = setupH2Db(ProposalModel.pu_name());
         em.getTransaction().begin();
         final ObservingProposal proposal = ex.getProposal();
         proposal.persistRefs(em);