Merge pull request #610 from keeps/alindo-dev-release

upgraded java and dependencies
keeps · Jun 26, 2024 · aa0c893 · aa0c893
2 parents 4a0d784 + 65e0152
commit aa0c893
Show file tree

Hide file tree

Showing 67 changed files with 421 additions and 381 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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.2</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.2</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,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-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.2</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,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-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.2</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
     <groupId>com.databasepreservation</groupId>
     <artifactId>dbptk-bindings-siarddk</artifactId>
     <version>1.5.1</version>
@@ -21,45 +29,28 @@
             <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>
                 <version>2.5.2</version>
-                <executions>
-                    <!--
-                    <execution>
-                        <id>default-install-project-repository-siard</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>install-file</goal>
-                        </goals>
-                        <configuration>
-                            <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file>
-                            <groupId>${project.groupId}</groupId>
-                            <artifactId>${project.artifactId}</artifactId>
-                            <version>${project.version}</version>
-                            <localRepositoryPath>${projectLocalRepository}</localRepositoryPath>
-                            <packaging>jar</packaging>
-                        </configuration>
-                    </execution>
-                    -->
-                </executions>
             </plugin>
         </plugins>
     </build>

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;