wip

keeps · Feb 29, 2024 · 7711b45 · 7711b45
1 parent fc79b3f
commit 7711b45
Show file tree

Hide file tree

Showing 23 changed files with 111 additions and 103 deletions.
diff --git a/dbptk-bindings/dbptk-bindings-siarddk/pom.xml b/dbptk-bindings/dbptk-bindings-siarddk/pom.xml
@@ -4,6 +4,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <name>dbptk-bindings-siarddk</name>
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>4.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
     <groupId>com.databasepreservation</groupId>
     <artifactId>dbptk-bindings-siarddk</artifactId>
     <version>1.5.1</version>

diff --git a/...gs/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/DocIndexType.java b/...gs/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/DocIndexType.java
@@ -17,11 +17,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * Index for all documents in the information package

diff --git a/...gs/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/DocumentType.java b/...gs/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/DocumentType.java
@@ -16,15 +16,15 @@
 
 import java.math.BigInteger;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.NormalizedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
  * A type for a document

diff --git a/...s/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/ObjectFactory.java b/...s/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/ObjectFactory.java
@@ -16,9 +16,9 @@
 
 import java.math.BigInteger;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
 /**

diff --git a/...gs/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/package-info.java b/...gs/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/package-info.java
@@ -12,5 +12,5 @@
 // Generated on: 2016.09.21 at 01:40:35 PM CEST 
 //
 
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.sa.dk/xmlns/diark/1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.sa.dk/xmlns/diark/1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package dk.sa.xmlns.diark._1_0.docindex;
diff --git a/.../dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/fileindex/FileIndexType.java b/.../dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/fileindex/FileIndexType.java
@@ -17,14 +17,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.HexBinaryAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
  * Index for all files in the information package

diff --git a/.../dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/fileindex/ObjectFactory.java b/.../dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/fileindex/ObjectFactory.java
@@ -14,9 +14,9 @@
 
 package dk.sa.xmlns.diark._1_0.fileindex;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
 /**

diff --git a/...s/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/fileindex/package-info.java b/...s/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/fileindex/package-info.java
@@ -12,5 +12,5 @@
 // Generated on: 2016.09.21 at 01:37:30 PM CEST 
 //
 
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.sa.dk/xmlns/diark/1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.sa.dk/xmlns/diark/1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package dk.sa.xmlns.diark._1_0.fileindex;
diff --git a/...gs/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ColumnType.java b/...gs/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ColumnType.java
@@ -17,13 +17,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
  * Column element in siardDiark Archive

diff --git a/...s/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ColumnsType.java b/...s/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ColumnsType.java
@@ -17,10 +17,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * List of columns

diff --git a/...bptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ForeignKeyType.java b/...bptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ForeignKeyType.java
@@ -17,13 +17,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
  * foreignKey element in siardDiark Archive

diff --git a/...ptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ForeignKeysType.java b/...ptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ForeignKeysType.java
@@ -17,10 +17,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * List of foreign keys

diff --git a/...gs-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/FunctionalDescriptionType.java b/...gs-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/FunctionalDescriptionType.java
@@ -14,9 +14,9 @@
 
 package dk.sa.xmlns.diark._1_0.tableindex;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * <p>

diff --git a/...dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ObjectFactory.java b/...dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ObjectFactory.java
@@ -14,7 +14,7 @@
 
 package dk.sa.xmlns.diark._1_0.tableindex;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 /**
  * This object contains factory methods for each Java content interface and Java

diff --git a/...bptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/PrimaryKeyType.java b/...bptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/PrimaryKeyType.java
@@ -17,13 +17,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
  * Type for a Primary key

diff --git a/...dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ReferenceType.java b/...dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ReferenceType.java
@@ -14,13 +14,13 @@
 
 package dk.sa.xmlns.diark._1_0.tableindex;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
  * reference element in siardDiark Archive

diff --git a/...gs/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/SiardDiark.java b/...gs/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/SiardDiark.java
@@ -14,14 +14,14 @@
 
 package dk.sa.xmlns.diark._1_0.tableindex;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
  * <p>

diff --git a/...ngs/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/TableType.java b/...ngs/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/TableType.java
@@ -16,13 +16,13 @@
 
 import java.math.BigInteger;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
  * type for table element in siardDiark Archive

diff --git a/...gs/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/TablesType.java b/...gs/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/TablesType.java
@@ -17,10 +17,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * type for en tabelliste, bestående af én eller flere tabeller

diff --git a/...ings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ViewType.java b/...ings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ViewType.java
@@ -14,13 +14,13 @@
 
 package dk.sa.xmlns.diark._1_0.tableindex;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
  * View element in siardDiark Archive

diff --git a/...ngs/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ViewsType.java b/...ngs/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ViewsType.java
@@ -17,10 +17,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * Type for a list of views

diff --git a/.../dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/package-info.java b/.../dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/package-info.java
@@ -12,5 +12,5 @@
 // Generated on: 2016.09.21 at 01:32:34 PM CEST 
 //
 
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.sa.dk/xmlns/diark/1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.sa.dk/xmlns/diark/1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package dk.sa.xmlns.diark._1_0.tableindex;
diff --git a/dbptk-bindings/pom.xml b/dbptk-bindings/pom.xml
@@ -18,9 +18,9 @@
         <version.java>21</version.java>
     </properties>
     <modules>
-        <module>dbptk-bindings-siard1</module>
+        <!---module>dbptk-bindings-siard1</module>
         <module>dbptk-bindings-siard2-0</module>
-        <module>dbptk-bindings-siard2-1</module>
+        <module>dbptk-bindings-siard2-1</module-->
         <module>dbptk-bindings-siarddk</module>
     </modules>
     <build>