wip

keeps · Feb 27, 2024 · fc79b3f · fc79b3f
1 parent 4a0d784
commit fc79b3f
Show file tree

Hide file tree

Showing 26 changed files with 104 additions and 77 deletions.
diff --git a/dbptk-bindings/dbptk-bindings-siard1/pom.xml b/dbptk-bindings/dbptk-bindings-siard1/pom.xml
@@ -3,6 +3,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-siard1</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-siard1</artifactId>
     <version>1.5.1</version>
@@ -20,7 +28,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.4</version>
+                <version>3.12.1</version>
                 <configuration>
                     <source>${version.java}</source>
                     <target>${version.java}</target>
@@ -35,8 +43,8 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/dbptk-bindings/dbptk-bindings-siard1/src/main/resources/config/jaxb/jodatime.xjb b/dbptk-bindings/dbptk-bindings-siard1/src/main/resources/config/jaxb/jodatime.xjb
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jxb:bindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+<jaxb:bindings xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
               xmlns:xs="http://www.w3.org/2001/XMLSchema"
-              version="2.1">
-    <jxb:globalBindings>
+              version="3.0">
+    <jaxb:globalBindings>
         <!-- use JODA-Time DateTime for xs:date -->
-        <jxb:javaType name="java.lang.String" xmlType="xs:date"
+        <jaxb:javaType name="java.lang.String" xmlType="xs:date"
                       parseMethod="java.lang.String.valueOf"
                       printMethod="java.lang.String.valueOf"/>
-    </jxb:globalBindings>
-</jxb:bindings>
+    </jaxb:globalBindings>
+</jaxb:bindings>
diff --git a/dbptk-bindings/dbptk-bindings-siard2-0/pom.xml b/dbptk-bindings/dbptk-bindings-siard2-0/pom.xml
@@ -3,6 +3,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-siard2-0</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-siard2-0</artifactId>
     <version>1.5.1</version>
@@ -20,7 +28,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.4</version>
+                <version>3.12.1</version>
                 <configuration>
                     <source>${version.java}</source>
                     <target>${version.java}</target>
@@ -35,8 +43,8 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/dbptk-bindings/dbptk-bindings-siard2-0/src/main/resources/config/jaxb/jodatime.xjb b/dbptk-bindings/dbptk-bindings-siard2-0/src/main/resources/config/jaxb/jodatime.xjb
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jxb:bindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+<jxb:bindings xmlns:jxb="https://jakarta.ee/xml/ns/jaxb"
               xmlns:xs="http://www.w3.org/2001/XMLSchema"
-              version="2.1">
+              version="3.0">
     <jxb:globalBindings>
         <!-- use JODA-Time DateTime for xs:date -->
         <jxb:javaType name="java.lang.String" xmlType="xs:date"

diff --git a/dbptk-bindings/dbptk-bindings-siard2-1/pom.xml b/dbptk-bindings/dbptk-bindings-siard2-1/pom.xml
@@ -3,6 +3,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-siard2-1</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-siard2-1</artifactId>
     <version>1.5.1</version>
@@ -20,7 +28,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.4</version>
+                <version>3.12.1</version>
                 <configuration>
                     <source>${version.java}</source>
                     <target>${version.java}</target>
@@ -35,8 +43,8 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/dbptk-bindings/dbptk-bindings-siard2-1/src/main/resources/config/jaxb/jodatime.xjb b/dbptk-bindings/dbptk-bindings-siard2-1/src/main/resources/config/jaxb/jodatime.xjb
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jxb:bindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+<jxb:bindings xmlns:jxb="https://jakarta.ee/xml/ns/jaxb"
               xmlns:xs="http://www.w3.org/2001/XMLSchema"
-              version="2.1">
+              version="3.0">
     <jxb:globalBindings>
         <!-- use JODA-Time DateTime for xs:date -->
         <jxb:javaType name="java.lang.String" xmlType="xs:date"

diff --git a/dbptk-bindings/dbptk-bindings-siarddk/pom.xml b/dbptk-bindings/dbptk-bindings-siarddk/pom.xml
@@ -21,22 +21,24 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.4</version>
+                <version>3.12.1</version>
                 <configuration>
                     <source>${version.java}</source>
                     <target>${version.java}</target>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <configuration>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
-
+            <plugin>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>

diff --git a/dbptk-bindings/pom.xml b/dbptk-bindings/pom.xml
@@ -15,7 +15,7 @@
     <packaging>pom</packaging>
     <properties>
         <projectLocalRepository>${project.basedir}/../../vendor-libs/repository</projectLocalRepository>
-        <version.java>1.7</version.java>
+        <version.java>21</version.java>
     </properties>
     <modules>
         <module>dbptk-bindings-siard1</module>
@@ -27,13 +27,11 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.jvnet.jaxb2.maven2</groupId>
-                    <artifactId>maven-jaxb2-plugin</artifactId>
-                    <version>0.12.3</version>
+                    <groupId>org.jvnet.jaxb</groupId>
+                    <artifactId>jaxb-maven-plugin</artifactId>
+                    <version>4.0.0</version>
                     <executions>
                         <execution>
-                            <id>generate-jaxb-siard</id>
-                            <phase>generate-sources</phase>
                             <goals>
                                 <goal>generate</goal>
                             </goals>
@@ -63,22 +61,22 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-install-plugin</artifactId>
-                    <version>2.5.2</version>
+                    <version>3.1.1</version>
                 </plugin>
             </plugins>
         </pluginManagement>
     </build>
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.12.3</version>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
+                <version>4.0.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
-                <version>2.5.2</version>
+                <version>3.1.1</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/dbptk-model/pom.xml b/dbptk-model/pom.xml
@@ -68,9 +68,8 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.3</version>
+            <version>3.0.0</version>
         </dependency>
-
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>

diff --git a/dbptk-model/src/main/java/com/databasepreservation/utils/MessageDigestUtils.java b/dbptk-model/src/main/java/com/databasepreservation/utils/MessageDigestUtils.java
@@ -11,7 +11,7 @@
 import java.io.InputStream;
 import java.security.MessageDigest;
 
-import javax.xml.bind.DatatypeConverter;
+import jakarta.xml.bind.DatatypeConverter;
 
 import org.apache.commons.codec.digest.DigestUtils;
 

diff --git a/...main/java/com/databasepreservation/modules/postgresql/out/PostgreSQLJDBCExportModule.java b/...main/java/com/databasepreservation/modules/postgresql/out/PostgreSQLJDBCExportModule.java
@@ -226,7 +226,7 @@ protected void handleSimpleTypeDateTimeDataCell(String data, PreparedStatement p
     if (type.getTimeDefined()) {
       if ("TIME WITH TIME ZONE".equalsIgnoreCase(type.getSql99TypeName())) {
         if (data != null) {
-          Calendar cal = javax.xml.bind.DatatypeConverter.parseTime(data);
+          Calendar cal = jakarta.xml.bind.DatatypeConverter.parseTime(data);
           Time time = new Time(cal.getTimeInMillis());
           LOGGER.debug("time with timezone after: " + time.toString() + "; timezone: " + cal.getTimeZone().getID());
           ps.setTime(index, time, cal);

diff --git a/...ule-siard/src/main/java/com/databasepreservation/modules/siard/common/SIARDValidator.java b/...ule-siard/src/main/java/com/databasepreservation/modules/siard/common/SIARDValidator.java
@@ -11,9 +11,9 @@
 import java.io.InputStream;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;

diff --git a/.../java/com/databasepreservation/modules/siard/in/content/SIARDDKContentImportStrategy.java b/.../java/com/databasepreservation/modules/siard/in/content/SIARDDKContentImportStrategy.java
@@ -18,7 +18,7 @@
 import java.util.regex.Pattern;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.DatatypeConverter;
+import jakarta.xml.bind.DatatypeConverter;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;

diff --git a/...java/com/databasepreservation/modules/siard/in/metadata/SIARD1MetadataImportStrategy.java b/...java/com/databasepreservation/modules/siard/in/metadata/SIARD1MetadataImportStrategy.java
@@ -13,9 +13,9 @@
 import java.util.List;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;

diff --git a/...ava/com/databasepreservation/modules/siard/in/metadata/SIARD20MetadataImportStrategy.java b/...ava/com/databasepreservation/modules/siard/in/metadata/SIARD20MetadataImportStrategy.java
@@ -13,9 +13,9 @@
 import java.util.List;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;

diff --git a/...ava/com/databasepreservation/modules/siard/in/metadata/SIARD21MetadataImportStrategy.java b/...ava/com/databasepreservation/modules/siard/in/metadata/SIARD21MetadataImportStrategy.java
@@ -13,9 +13,9 @@
 import java.util.List;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;

diff --git a/...ava/com/databasepreservation/modules/siard/in/metadata/SIARDDKMetadataImportStrategy.java b/...ava/com/databasepreservation/modules/siard/in/metadata/SIARDDKMetadataImportStrategy.java
@@ -15,9 +15,9 @@
 import java.util.List;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;

diff --git a/...c/main/java/com/databasepreservation/modules/siard/in/path/SIARDDKPathImportStrategy.java b/...c/main/java/com/databasepreservation/modules/siard/in/path/SIARDDKPathImportStrategy.java
@@ -18,10 +18,10 @@
 import java.util.regex.Pattern;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;

diff --git a/...ava/com/databasepreservation/modules/siard/out/metadata/SIARD1MetadataExportStrategy.java b/...ava/com/databasepreservation/modules/siard/out/metadata/SIARD1MetadataExportStrategy.java
@@ -14,9 +14,9 @@
 import java.util.List;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;

diff --git a/...va/com/databasepreservation/modules/siard/out/metadata/SIARD20MetadataExportStrategy.java b/...va/com/databasepreservation/modules/siard/out/metadata/SIARD20MetadataExportStrategy.java
@@ -15,9 +15,9 @@
 import java.util.Map;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;

diff --git a/...va/com/databasepreservation/modules/siard/out/metadata/SIARD21MetadataExportStrategy.java b/...va/com/databasepreservation/modules/siard/out/metadata/SIARD21MetadataExportStrategy.java
@@ -15,9 +15,9 @@
 import java.util.Map;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;

diff --git a/...ain/java/com/databasepreservation/modules/siard/out/metadata/StandardSIARDMarshaller.java b/...ain/java/com/databasepreservation/modules/siard/out/metadata/StandardSIARDMarshaller.java
@@ -12,9 +12,9 @@
 import java.io.OutputStream;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;