diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8cf115679..53f0e3f2a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -42,10 +42,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Set up JDK 8 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: 8 + java-version: 21 distribution: 'adopt' - name: Cache uses: actions/cache@v4 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 29cdcc7fc..f34dac728 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,10 +30,10 @@ jobs: with: languages: java - - name: Set up JDK 8 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: 8 + java-version: 21 distribution: 'adopt' - name: Autobuild diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c56bf96eb..5dfe0e333 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,10 +42,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Set up JDK 8 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: 8 + java-version: 21 distribution: 'adopt' - name: Cache uses: actions/cache@v4 @@ -72,10 +72,10 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Set up JDK 8 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: 8 + java-version: 21 distribution: 'adopt' - name: Cache uses: actions/cache@v4 diff --git a/dbptk-bindings/dbptk-bindings-siard1/pom.xml b/dbptk-bindings/dbptk-bindings-siard1/pom.xml index 59424c80a..ae94c9f9f 100644 --- 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"> 4.0.0 dbptk-bindings-siard1 + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 + compile + + com.databasepreservation dbptk-bindings-siard1 1.5.1 @@ -20,7 +28,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.4 + 3.12.1 ${version.java} ${version.java} @@ -35,8 +43,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.apache.maven.plugins 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 index cc7d8c61f..14a1404b1 100644 --- 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 @@ - - + version="3.0"> + - - - + + diff --git a/dbptk-bindings/dbptk-bindings-siard2-0/pom.xml b/dbptk-bindings/dbptk-bindings-siard2-0/pom.xml index b762a03c5..63400aa14 100644 --- 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"> 4.0.0 dbptk-bindings-siard2-0 + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 + compile + + com.databasepreservation dbptk-bindings-siard2-0 1.5.1 @@ -20,7 +28,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.4 + 3.12.1 ${version.java} ${version.java} @@ -35,8 +43,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.apache.maven.plugins 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 index cc7d8c61f..14a1404b1 100644 --- 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,11 +1,11 @@ - - + version="3.0"> + - - - + + diff --git a/dbptk-bindings/dbptk-bindings-siard2-1/pom.xml b/dbptk-bindings/dbptk-bindings-siard2-1/pom.xml index 0b6534bf3..c3b693c37 100644 --- 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"> 4.0.0 dbptk-bindings-siard2-1 + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 + compile + + com.databasepreservation dbptk-bindings-siard2-1 1.5.1 @@ -20,7 +28,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.4 + 3.12.1 ${version.java} ${version.java} @@ -35,8 +43,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.apache.maven.plugins 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 index cc7d8c61f..14a1404b1 100644 --- 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,11 +1,11 @@ - - + version="3.0"> + - - - + + diff --git a/dbptk-bindings/dbptk-bindings-siarddk/pom.xml b/dbptk-bindings/dbptk-bindings-siarddk/pom.xml index ebe62dfbb..bb4f51a85 100644 --- 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"> 4.0.0 dbptk-bindings-siarddk + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 + compile + + com.databasepreservation dbptk-bindings-siarddk 1.5.1 @@ -21,14 +29,13 @@ org.apache.maven.plugins maven-compiler-plugin - 2.4 + 3.12.1 ${version.java} ${version.java} UTF-8 - org.apache.maven.plugins maven-resources-plugin @@ -36,30 +43,14 @@ UTF-8 - + + org.jvnet.jaxb + jaxb-maven-plugin + org.apache.maven.plugins maven-install-plugin 2.5.2 - - - diff --git a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/DocIndexType.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/DocIndexType.java index a8d5db9ec..9b0e0edb1 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/DocIndexType.java +++ b/dbptk-bindings/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/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/DocumentType.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/DocumentType.java index 6d4274b02..6d4d1894b 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/DocumentType.java +++ b/dbptk-bindings/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/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/ObjectFactory.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/ObjectFactory.java index 1859a99d4..51e713055 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/ObjectFactory.java +++ b/dbptk-bindings/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/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/package-info.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/package-info.java index a61518f33..9dd4cacca 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/docindex/package-info.java +++ b/dbptk-bindings/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/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/fileindex/FileIndexType.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/fileindex/FileIndexType.java index 138dd2ddf..af5006c0f 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/fileindex/FileIndexType.java +++ b/dbptk-bindings/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/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/fileindex/ObjectFactory.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/fileindex/ObjectFactory.java index c6b435d8a..7fd9bd2a8 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/fileindex/ObjectFactory.java +++ b/dbptk-bindings/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/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/fileindex/package-info.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/fileindex/package-info.java index 513666304..04df04824 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/fileindex/package-info.java +++ b/dbptk-bindings/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/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ColumnType.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ColumnType.java index 62b4cfdb7..7688fe81b 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ColumnType.java +++ b/dbptk-bindings/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/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ColumnsType.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ColumnsType.java index cc97465de..ed90c7f97 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ColumnsType.java +++ b/dbptk-bindings/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/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ForeignKeyType.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ForeignKeyType.java index dedf4461e..27b665001 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ForeignKeyType.java +++ b/dbptk-bindings/dbptk-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/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ForeignKeysType.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ForeignKeysType.java index b9198d29c..0590c0791 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ForeignKeysType.java +++ b/dbptk-bindings/dbptk-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/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/FunctionalDescriptionType.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/FunctionalDescriptionType.java index 05dc7169a..d8aca31c7 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/FunctionalDescriptionType.java +++ b/dbptk-bindings/dbptk-bindings-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; /** *

diff --git a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ObjectFactory.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ObjectFactory.java index f09047833..6f10faca4 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ObjectFactory.java +++ b/dbptk-bindings/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/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/PrimaryKeyType.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/PrimaryKeyType.java index efa27b19a..d7304a211 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/PrimaryKeyType.java +++ b/dbptk-bindings/dbptk-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/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ReferenceType.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ReferenceType.java index 60e721fb6..02b387dc1 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ReferenceType.java +++ b/dbptk-bindings/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/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/SiardDiark.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/SiardDiark.java index 8b05c21b6..f586d839d 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/SiardDiark.java +++ b/dbptk-bindings/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; /** *

diff --git a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/TableType.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/TableType.java index e7515bf34..747944a5f 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/TableType.java +++ b/dbptk-bindings/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/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/TablesType.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/TablesType.java index 6e38251d2..a75cd9c6e 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/TablesType.java +++ b/dbptk-bindings/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/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ViewType.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ViewType.java index a5c09c13f..3336c65c2 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ViewType.java +++ b/dbptk-bindings/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/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ViewsType.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ViewsType.java index 12e370b34..64787a56f 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/ViewsType.java +++ b/dbptk-bindings/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/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/package-info.java b/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/package-info.java index 7442d7d26..f1bd992ab 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/java/dk/sa/xmlns/diark/_1_0/tableindex/package-info.java +++ b/dbptk-bindings/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/dbptk-bindings-siarddk/src/main/resources/schema/XMLSchema.dtd b/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/XMLSchema.dtd new file mode 100644 index 000000000..adf2c738b --- /dev/null +++ b/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/XMLSchema.dtd @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/docIndex_original.xsd b/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/docIndex_original.xsd deleted file mode 100644 index 9a4b00b55..000000000 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/docIndex_original.xsd +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - Indeks for alle documenter i arkiveringsversionen - Index for all documents in the information package - - - - - - - - type for et dokument - A type for a document - - - - - DocID - ID, som entydigt udpeger det enkelte dokument - DocID - ID that uniquely identifies a document- - - - - - ParentID - ID på overordnet dokument ved indlejrede dokumenter eller dokumenter, der på anden vis indgår i et hierarki - ParentID - ID of the parent document for embedded documents or for documents which are otherwise part of a hierarchy - - - - - MediaID - ID på det lagringsmedie, som dokumentet ligger på - MediaID - ID for the storage media of the the document - - - - - ContainerFolder - Dokumentsamlingsmappe, som dokumentet ligger i. Skal være unikt inden for Documents, men dette krav er ikke indført i dette XML Schema for at lette skabelse og validering - ContainerFolder - document container folder in which the document is residing. Must be unique within Documents, but this requirement is not implemented in this XML Schema in order to ease creation and validation - - - - - OriginalFilename - Angivelse af filens navn inkl. suffix i IT-systemet - OriginalFilename - The original name of the file in the IT-system including its extension - - - - - Angivelse af filens format i arkiveringsversionen - The format of the file in the information package - - - - - For GML filer angives det skema, der skal bruges til validering af den pågældende GML-fil - GML Schema to be used to for validation the GML-file in question - - - - - - - type for et dokumentID - A type for a document ID - - - - - - - - type for et medie ID - A type for a media ID - - - - - - - - Type for en dokumentundermappenavn - Type for a document container folder name - - - - - - - - type for et dokument i arkiveringversionen - type for a document in the information package - Små bogstaver (minuskler) for filtyper (suffix) er krævet i bekendtgørelse, men store bogstaver (versaler) er tilladt i skemaet for at mindske behov for navneændring - Lower case is required, but upper case for the following file type extensions is accepted to reduce the need for renaming--> - - - - - - - - - - - - - - Navn for et gml xml skema - Name for a gml xml schema - - - - - - diff --git a/dbptk-bindings/pom.xml b/dbptk-bindings/pom.xml index c91ae359e..1de447ecd 100644 --- a/dbptk-bindings/pom.xml +++ b/dbptk-bindings/pom.xml @@ -15,7 +15,7 @@ pom ${project.basedir}/../../vendor-libs/repository - 1.7 + 21 dbptk-bindings-siard1 @@ -27,43 +27,63 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.12.3 + org.jvnet.jaxb + jaxb-maven-plugin + 4.0.0 - generate-jaxb-siard - generate-sources generate - - - - false + + false - - ${basedir}/src/main/resources/schema - - *.xsd - + + ${basedir}/src/main/resources/schema + + archiveIndex.xsd + docIndex.xsd + + fileIndex.xsd + XMLSchema.xsd + tableIndex.xsd + siard2-1-metadata.xsd + siard2-0-metadata.xsd + siard1-metadata.xsd + - - ${basedir}/src/main/resources/config/jaxb - - *.xjb - - - ${project.build.directory}/generated-sources/xjc + + ${basedir}/src/main/resources/config/jaxb + + *.xjb + + + ${project.build.directory}/generated-sources/xjc - - com.databasepreservation.modules.siard.bindings.${packagename} + + com.databasepreservation.modules.siard.bindings.${packagename} + + + + + true + + -Xsimplify + -Xnamespace-prefix + + + + org.jvnet.jaxb + jaxb-plugins + 3.0.0 + + org.apache.maven.plugins maven-install-plugin - 2.5.2 + 3.1.1 @@ -71,14 +91,14 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.12.3 + org.jvnet.jaxb + jaxb-maven-plugin + 4.0.0 org.apache.maven.plugins maven-install-plugin - 2.5.2 + 3.1.1 diff --git a/dbptk-core/src/test/java/com/databasepreservation/siarddk/TestFileIndexFileStrategy.java b/dbptk-core/src/test/java/com/databasepreservation/siarddk/TestFileIndexFileStrategy.java index e0dc40231..584114ce1 100644 --- a/dbptk-core/src/test/java/com/databasepreservation/siarddk/TestFileIndexFileStrategy.java +++ b/dbptk-core/src/test/java/com/databasepreservation/siarddk/TestFileIndexFileStrategy.java @@ -16,7 +16,7 @@ import java.nio.file.FileSystems; import java.nio.file.Path; -import javax.xml.bind.DatatypeConverter; +import jakarta.xml.bind.DatatypeConverter; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; diff --git a/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Indices/fileIndex.xml b/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Indices/fileIndex.xml index 150564ada..96c931232 100644 --- a/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Indices/fileIndex.xml +++ b/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Indices/fileIndex.xml @@ -23,7 +23,7 @@ AVID.HEX.2000.1\Schemas\standard fileIndex.xsd - BC828D70D073029CE8C5FDBC6651C4F3 + 143BEC3B0E6D43E52B539F2CCD0B7A68 AVID.HEX.2000.1\Schemas\standard diff --git a/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Schemas/standard/fileIndex.xsd b/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Schemas/standard/fileIndex.xsd index 59b05a4c8..fa4d9cfd7 100644 --- a/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Schemas/standard/fileIndex.xsd +++ b/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Schemas/standard/fileIndex.xsd @@ -68,6 +68,7 @@ + diff --git a/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Indices/fileIndex.xml b/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Indices/fileIndex.xml index 6cbc7ccfd..88d71e941 100644 --- a/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Indices/fileIndex.xml +++ b/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Indices/fileIndex.xml @@ -23,7 +23,7 @@ AVID.TST.4000.1\Schemas\standard fileIndex.xsd - BC828D70D073029CE8C5FDBC6651C4F3 + 143BEC3B0E6D43E52B539F2CCD0B7A68 AVID.TST.4000.1\Schemas\standard diff --git a/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Schemas/standard/fileIndex.xsd b/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Schemas/standard/fileIndex.xsd index 59b05a4c8..fa4d9cfd7 100644 --- a/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Schemas/standard/fileIndex.xsd +++ b/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Schemas/standard/fileIndex.xsd @@ -68,6 +68,7 @@ + diff --git a/dbptk-model/pom.xml b/dbptk-model/pom.xml index 825fbe45d..d759e51bd 100644 --- a/dbptk-model/pom.xml +++ b/dbptk-model/pom.xml @@ -37,7 +37,7 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 commons-io @@ -68,13 +68,18 @@ jakarta.xml.bind jakarta.xml.bind-api - 2.3.3 + 4.0.2 - com.sun.xml.bind jaxb-impl - 2.3.7 + 4.0.5 + runtime + + + org.glassfish.jaxb + jaxb-runtime + 4.0.5 com.google.guava @@ -108,4 +113,11 @@ + + + maven_central + Maven Central + https://repo.maven.apache.org/maven2/ + + \ No newline at end of file diff --git a/dbptk-model/src/main/java/com/databasepreservation/utils/MessageDigestUtils.java b/dbptk-model/src/main/java/com/databasepreservation/utils/MessageDigestUtils.java index 320da0c99..1e46d7584 100644 --- 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/dbptk-modules/dbptk-module-ms-access/pom.xml b/dbptk-modules/dbptk-module-ms-access/pom.xml index 39b0935c9..f7dc8a454 100644 --- a/dbptk-modules/dbptk-module-ms-access/pom.xml +++ b/dbptk-modules/dbptk-module-ms-access/pom.xml @@ -39,7 +39,7 @@ org.bouncycastle bcprov-jdk18on - 1.77 + 1.78.1 diff --git a/dbptk-modules/dbptk-module-mysql/pom.xml b/dbptk-modules/dbptk-module-mysql/pom.xml index 7c99bee5f..1f07d0385 100644 --- a/dbptk-modules/dbptk-module-mysql/pom.xml +++ b/dbptk-modules/dbptk-module-mysql/pom.xml @@ -28,7 +28,7 @@ mysql mysql-connector-java - 5.1.47 + 8.0.33 diff --git a/dbptk-modules/dbptk-module-mysql/src/main/java/com/databasepreservation/modules/mysql/MySQLExceptionNormalizer.java b/dbptk-modules/dbptk-module-mysql/src/main/java/com/databasepreservation/modules/mysql/MySQLExceptionNormalizer.java index 7a33b9da9..9e4805f1f 100644 --- a/dbptk-modules/dbptk-module-mysql/src/main/java/com/databasepreservation/modules/mysql/MySQLExceptionNormalizer.java +++ b/dbptk-modules/dbptk-module-mysql/src/main/java/com/databasepreservation/modules/mysql/MySQLExceptionNormalizer.java @@ -94,8 +94,8 @@ public ModuleException normalizeException(Exception exception, String contextMes // these are also SQLExceptions, but prefer using the codes above since they are // more specific and then check if it is a "connection problem" - if (exception instanceof com.mysql.jdbc.CommunicationsException - || exception instanceof com.mysql.jdbc.exceptions.jdbc4.CommunicationsException) { + if (exception instanceof com.mysql.cj.jdbc.exceptions.CommunicationsException + || exception instanceof com.mysql.cj.exceptions.CJCommunicationsException) { return new ConnectionException().withCause(exception); } diff --git a/dbptk-modules/dbptk-module-mysql/src/main/java/com/databasepreservation/modules/mysql/in/MySQLDatatypeImporter.java b/dbptk-modules/dbptk-module-mysql/src/main/java/com/databasepreservation/modules/mysql/in/MySQLDatatypeImporter.java index 4eafb4928..36e4eeeb0 100644 --- a/dbptk-modules/dbptk-module-mysql/src/main/java/com/databasepreservation/modules/mysql/in/MySQLDatatypeImporter.java +++ b/dbptk-modules/dbptk-module-mysql/src/main/java/com/databasepreservation/modules/mysql/in/MySQLDatatypeImporter.java @@ -60,7 +60,7 @@ protected Type getBinaryType(String typeName, int columnSize, int decimalDigits, protected Type getVarbinaryType(String typeName, int columnSize, int decimalDigits, int numPrecRadix) { Type type = new SimpleTypeBinary(columnSize); type.setSql99TypeName("BIT VARYING", columnSize * 8); - type.setSql2008TypeName("BIT VARYING", columnSize * 8); + type.setSql2008TypeName("BINARY VARYING", columnSize * 8); return type; } diff --git a/dbptk-modules/dbptk-module-oracle/pom.xml b/dbptk-modules/dbptk-module-oracle/pom.xml index 06afb0a44..1199d2df7 100644 --- a/dbptk-modules/dbptk-module-oracle/pom.xml +++ b/dbptk-modules/dbptk-module-oracle/pom.xml @@ -41,7 +41,7 @@ org.geotools.jdbc gt-jdbc-oracle - 21.0 + 28.5 com.oracle.ojdbc @@ -52,7 +52,7 @@ com.oracle.database.xml xdb - 21.5.0.0 + 21.13.0.0 diff --git a/dbptk-modules/dbptk-module-postgresql/pom.xml b/dbptk-modules/dbptk-module-postgresql/pom.xml index cefad3d19..3dfb056e0 100644 --- a/dbptk-modules/dbptk-module-postgresql/pom.xml +++ b/dbptk-modules/dbptk-module-postgresql/pom.xml @@ -29,7 +29,7 @@ org.postgresql postgresql - 9.4.1212.jre7 + 42.7.3 diff --git a/dbptk-modules/dbptk-module-postgresql/src/main/java/com/databasepreservation/modules/postgresql/in/PostgreSQLJDBCDatatypeImporter.java b/dbptk-modules/dbptk-module-postgresql/src/main/java/com/databasepreservation/modules/postgresql/in/PostgreSQLJDBCDatatypeImporter.java index ae903acdb..c47caf5f7 100644 --- a/dbptk-modules/dbptk-module-postgresql/src/main/java/com/databasepreservation/modules/postgresql/in/PostgreSQLJDBCDatatypeImporter.java +++ b/dbptk-modules/dbptk-module-postgresql/src/main/java/com/databasepreservation/modules/postgresql/in/PostgreSQLJDBCDatatypeImporter.java @@ -159,7 +159,16 @@ protected Type getNumericType(String typeName, int columnSize, int decimalDigits // The maximum allowed precision when explicitly specified in the type // declaration is 1000, so if we find more than that it means that this type was // declared without precision nor scale - if (columnSize > 1000) { + + //20240626 alindo: when upgrading the conector to version 42.7.3 it sets the data type + // scale and precision to 0 when they are not specified which is against SIARD specification + // https://github.com/pgjdbc/pgjdbc/issues/2188 + if (columnSize == 0) { + type.setSql99TypeName("NUMERIC", NUMERIC_MAX_PRECISION_NUMBER, NUMERIC_MAX_SCALE_NUMBER); + type.setSql2008TypeName("NUMERIC", NUMERIC_MAX_PRECISION_NUMBER, NUMERIC_MAX_SCALE_NUMBER); + reporter.customMessage(this.getClass().getName(), + "Column data length is 0. Replacing the length to the max data length " + NUMERIC_MAX_PRECISION_NUMBER); + } else if (columnSize > 1000) { type.setSql99TypeName("NUMERIC", NUMERIC_MAX_PRECISION_NUMBER, NUMERIC_MAX_SCALE_NUMBER); type.setSql2008TypeName("NUMERIC", NUMERIC_MAX_PRECISION_NUMBER, NUMERIC_MAX_SCALE_NUMBER); reporter.customMessage(this.getClass().getName(), diff --git a/dbptk-modules/dbptk-module-postgresql/src/main/java/com/databasepreservation/modules/postgresql/out/PostgreSQLJDBCExportModule.java b/dbptk-modules/dbptk-module-postgresql/src/main/java/com/databasepreservation/modules/postgresql/out/PostgreSQLJDBCExportModule.java index 38c910921..a70c8e316 100644 --- a/dbptk-modules/dbptk-module-postgresql/src/main/java/com/databasepreservation/modules/postgresql/out/PostgreSQLJDBCExportModule.java +++ b/dbptk-modules/dbptk-module-postgresql/src/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/dbptk-modules/dbptk-module-siard/pom.xml b/dbptk-modules/dbptk-module-siard/pom.xml index 89e4e79b1..c6d8787b2 100644 --- a/dbptk-modules/dbptk-module-siard/pom.xml +++ b/dbptk-modules/dbptk-module-siard/pom.xml @@ -63,18 +63,40 @@ org.jdom jdom2 - 2.0.6 + 2.0.6.1 org.apache.commons commons-compress - 1.26.0 + 1.26.1 org.mapdb mapdb 3.1.0 + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 + + + com.sun.xml.bind + jaxb-impl + 4.0.5 + runtime + + + org.glassfish.jaxb + jaxb-runtime + 4.0.5 + + + com.databasepreservation + dbptk-bindings-siard2-1 + 1.5.1 + compile + diff --git a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/common/SIARDValidator.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/common/SIARDValidator.java index 519ed4931..07e7b9973 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/common/SIARDValidator.java +++ b/dbptk-modules/dbptk-module-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/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/content/SIARDDKContentImportStrategy.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/content/SIARDDKContentImportStrategy.java index a59005198..7c68168a9 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/content/SIARDDKContentImportStrategy.java +++ b/dbptk-modules/dbptk-module-siard/src/main/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/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/metadata/SIARD1MetadataImportStrategy.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/metadata/SIARD1MetadataImportStrategy.java index 053c17582..bcbf4a567 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/metadata/SIARD1MetadataImportStrategy.java +++ b/dbptk-modules/dbptk-module-siard/src/main/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/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/metadata/SIARD20MetadataImportStrategy.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/metadata/SIARD20MetadataImportStrategy.java index fbbff79da..d0e03bae3 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/metadata/SIARD20MetadataImportStrategy.java +++ b/dbptk-modules/dbptk-module-siard/src/main/java/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/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/metadata/SIARD21MetadataImportStrategy.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/metadata/SIARD21MetadataImportStrategy.java index 3e5560fec..7c2896dcc 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/metadata/SIARD21MetadataImportStrategy.java +++ b/dbptk-modules/dbptk-module-siard/src/main/java/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/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/metadata/SIARDDKMetadataImportStrategy.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/metadata/SIARDDKMetadataImportStrategy.java index e742c50ce..65ef950ca 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/metadata/SIARDDKMetadataImportStrategy.java +++ b/dbptk-modules/dbptk-module-siard/src/main/java/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/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/path/SIARDDKPathImportStrategy.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/path/SIARDDKPathImportStrategy.java index 367f5fb28..ff3200ec5 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/path/SIARDDKPathImportStrategy.java +++ b/dbptk-modules/dbptk-module-siard/src/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/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARD1MetadataExportStrategy.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARD1MetadataExportStrategy.java index 041808e52..a3e0e9df6 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARD1MetadataExportStrategy.java +++ b/dbptk-modules/dbptk-module-siard/src/main/java/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; @@ -88,7 +88,7 @@ import com.databasepreservation.modules.siard.out.write.WriteStrategy; import com.databasepreservation.utils.JodaUtils; import com.databasepreservation.utils.XMLUtils; - +import jakarta.xml.bind.JAXBContext; /** * @author Bruno Ferreira */ diff --git a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARD20MetadataExportStrategy.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARD20MetadataExportStrategy.java index 8d4246785..e7f599e36 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARD20MetadataExportStrategy.java +++ b/dbptk-modules/dbptk-module-siard/src/main/java/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/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARD21MetadataExportStrategy.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARD21MetadataExportStrategy.java index 12942e9ee..deaaaa5a4 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARD21MetadataExportStrategy.java +++ b/dbptk-modules/dbptk-module-siard/src/main/java/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/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARDDKMetadataExportStrategy.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARDDKMetadataExportStrategy.java index 087760964..37d49205a 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARDDKMetadataExportStrategy.java +++ b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARDDKMetadataExportStrategy.java @@ -151,9 +151,9 @@ public void writeMetadataXSD(DatabaseStructure dbStructure, SIARDArchiveContaine writeSchemaFile(outputContainer, SIARDDKConstants.TABLE_INDEX, writeStrategy); writeSchemaFile(outputContainer, SIARDDKConstants.ARCHIVE_INDEX, writeStrategy); writeSchemaFile(outputContainer, SIARDDKConstants.CONTEXT_DOCUMENTATION_INDEX, writeStrategy); - writeSchemaFile(outputContainer, SIARDDKConstants.FILE_INDEX + "_original", writeStrategy); + writeSchemaFile(outputContainer, SIARDDKConstants.FILE_INDEX, writeStrategy); if (lobsTracker.getLOBsCount() > 0) { - writeSchemaFile(outputContainer, SIARDDKConstants.DOC_INDEX + "_original", writeStrategy); + writeSchemaFile(outputContainer, SIARDDKConstants.DOC_INDEX, writeStrategy); } } @@ -182,9 +182,11 @@ private void writeSchemaFile(SIARDArchiveContainer container, String indexFile, OutputStream outputStream = fileIndexFileStrategy.getWriter(container, path, writeStrategy); try { - IOUtils.copy(inputStream, outputStream); - inputStream.close(); - outputStream.close(); + if (inputStream != null) { + IOUtils.copy(inputStream, outputStream); + inputStream.close(); + outputStream.close(); + } fileIndexFileStrategy.addFile(path); diff --git a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/StandardSIARDMarshaller.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/StandardSIARDMarshaller.java index 085eafcf5..6d6ee4da7 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/StandardSIARDMarshaller.java +++ b/dbptk-modules/dbptk-module-siard/src/main/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; diff --git a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/validate/component/metadata/MetadataDatabaseInfoValidator.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/validate/component/metadata/MetadataDatabaseInfoValidator.java index 2fd76893c..6ba1888d3 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/validate/component/metadata/MetadataDatabaseInfoValidator.java +++ b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/validate/component/metadata/MetadataDatabaseInfoValidator.java @@ -194,7 +194,7 @@ public boolean validate() throws ModuleException { /** * M_5.1-1-1: Version is mandatory in SIARD 2.1 specification * - * A_M_511_1: Additional check, Version can be dk, 1.0, 2.0, 2.1., WARNING if it + * A_M_511_1: Additional check, Version can be dk, 1.0, 2.0, 2.1, 2.2., WARNING if it * is invalid * */ diff --git a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/validate/component/tableData/RequirementsForTableDataValidator.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/validate/component/tableData/RequirementsForTableDataValidator.java index 1cab81eab..a96e2951f 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/validate/component/tableData/RequirementsForTableDataValidator.java +++ b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/validate/component/tableData/RequirementsForTableDataValidator.java @@ -30,7 +30,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/dbptk-modules/pom.xml b/dbptk-modules/pom.xml index 638488143..25eaa2264 100644 --- a/dbptk-modules/pom.xml +++ b/dbptk-modules/pom.xml @@ -15,7 +15,7 @@ pom ${project.basedir}/../../vendor-libs/repository - 1.7 + 21 dbptk-filter-inventory diff --git a/dbptk-plugin-example/pom.xml b/dbptk-plugin-example/pom.xml index 5b0a36fb9..f2a596cb3 100644 --- a/dbptk-plugin-example/pom.xml +++ b/dbptk-plugin-example/pom.xml @@ -8,7 +8,7 @@ 2.0.0-rc3.1.0 jar - 1.7 + 21 @@ -22,7 +22,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.4 + 3.12.1 ${version.java} ${version.java} diff --git a/pom.xml b/pom.xml index 33d0d1e7c..1bd7e7148 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ https://www.keep.pt - 1.8 + 21 ${project.basedir}/vendor-libs/repository @@ -137,10 +137,14 @@ org.apache.maven.plugins maven-compiler-plugin - 2.4 + 3.12.1 - 1.8 - 1.8 + + --add-exports + java.xml/com.sun.org.apache.xerces.internal.jaxp=ALL-UNNAMED + + 21 + 21 UTF-8 @@ -167,12 +171,12 @@ org.apache.maven.plugins maven-assembly-plugin - 3.4.2 + 3.7.1 org.apache.maven.plugins maven-surefire-plugin - 2.18.1 + 3.2.5 pl.project13.maven @@ -328,7 +332,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 org.apache.commons @@ -343,17 +347,17 @@ org.slf4j slf4j-api - 2.0.11 + 2.0.12 ch.qos.logback logback-classic - 1.3.14 + 1.5.4 ch.qos.logback logback-core - 1.3.14 + 1.5.4 @@ -370,15 +374,29 @@ joda-time joda-time - 2.12.6 + 2.12.7 commons-cli commons-cli 1.3.1 - - + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 + + + com.sun.xml.bind + jaxb-impl + 4.0.5 + runtime + + + org.glassfish.jaxb + jaxb-runtime + 4.0.5 + org.hamcrest