diff --git a/CHANGELOG.md b/CHANGELOG.md
index 735dec1..ab11260 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ Changes of the Bitrepository.org protocol specification.
 The change log covers changes in the protocol from protocol version 23 and newer. 
 Changes prior to version 23 have never been documented in a change log form. For references of changes prior to that look at the version control history.
 
+## [33] - 2026-07-14
+###
+- Updated to use Java 17 and Jakarta
+
 ## [32] - 2022-09-07
 ### Changed
 - Project `groupId` updated from `org.bitrepository` to `org.bitrepository.message-xml`
diff --git a/Jenkinsfile b/Jenkinsfile
index 8b007a8..745742f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,59 +1,8 @@
-#!/usr/bin/env groovy
-
-openshift.withCluster() {
-
-    podTemplate(
-            inheritFrom: 'maven',
-            cloud: 'openshift', //cloud must be openshift
-            envVars: [ //This fixes the error with en_US.utf8 not being found
-                       envVar(key:"LC_ALL", value:"C.utf8")
-            ],
-            volumes: [ //mount the settings.xml
-                       secretVolume(mountPath: '/etc/m2', secretName: 'maven-settings')
-            ]) {
-
-        try {
-            //GO to a node with maven and settings.xml
-            node(POD_LABEL) {
-                //Do not use concurrent builds
-                properties([disableConcurrentBuilds()])
-
-                def mvnCmd = "mvn -s /etc/m2/settings.xml --batch-mode"
-
-                stage('checkout') {
-                    checkout scm
-                }
-
-                stage('Mvn clean package') {
-                    sh "${mvnCmd} -PallTests clean package"
-                }
-
-                stage('Analyze build results') {
-                    recordIssues aggregatingResults: true,
-                            tools: [java(),
-                                    javaDoc(),
-                                    mavenConsole(),
-                                    taskScanner(highTags:'FIXME', normalTags:'TODO', includePattern: '**/*.java', excludePattern: 'target/**/*')]
-                }
-
-                stage('Push to Nexus (if Master)') {
-                    echo "Branch name ${env.BRANCH_NAME}"
-                    if (env.BRANCH_NAME == 'master') {
-                        sh "${mvnCmd} clean deploy -DskipTests=true"
-                    } else {
-                        echo "Branch ${env.BRANCH_NAME} is not master, so no mvn deploy"
-                    }
-                }
-            }
-        } catch (e) {
-            currentBuild.result = 'FAILURE'
-            throw e
-        } finally {
-            configFileProvider([configFile(fileId: "notifier", variable: 'notifier')]) {
-                def notifier = load notifier
-                notifier.notifyInCaseOfFailureOrImprovement(true, "#playground")
-            }
-        }
-    }
-}
-
+library identifier: 'StandardBuild@master', retriever: modernSCM(scm: [$class: 'GitSCMSource', remote: 'https://sbprojects.statsbiblioteket.dk/stash/scm/ist/jenkins-shared.git', credentialsId: 'crowd'],libraryPath: "Kuana") _
+
+StandardBuild {
+    agent="maven"
+    maven="3.9.11"
+    jdk="21"
+    mavenLocalRepo='${WORKSPACE}/.repository/'
+}
\ No newline at end of file
diff --git a/message-xml-java/pom.xml b/message-xml-java/pom.xml
index 8bfd21c..3feb865 100644
--- a/message-xml-java/pom.xml
+++ b/message-xml-java/pom.xml
@@ -13,27 +13,26 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jvnet.jaxb2_commons</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
-      <version>0.11.1</version>
+      <groupId>org.jvnet.jaxb</groupId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
+      <version>4.0.12</version>
     </dependency>
-    <!-- Below jakarta/jaxb dependencies are necessary for jaxb-xml with java 11-->
-    <!-- https://mvnrepository.com/artifact/javax.xml.bind/javax.xml.bind-api -->
     <dependency>
+      <!-- https://mvnrepository.com/artifact/javax.xml.bind/javax.xml.bind-api -->
       <groupId>jakarta.xml.bind</groupId>
       <artifactId>jakarta.xml.bind-api</artifactId>
-      <version>2.3.3</version>
+      <version>4.0.5</version>
     </dependency>
-    <!-- https://mvnrepository.com/artifact/jakarta.activation/jakarta.activation-api -->
     <dependency>
+      <!-- https://mvnrepository.com/artifact/jakarta.activation/jakarta.activation-api -->
       <groupId>jakarta.activation</groupId>
       <artifactId>jakarta.activation-api</artifactId>
-      <version>1.2.2</version>
+      <version>2.1.4</version>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
-      <version>2.3.6</version>
+      <version>4.0.9</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -108,72 +107,54 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jaxb2-maven-plugin</artifactId>
-        <version>2.5.0</version>
+        <groupId>org.jvnet.jaxb</groupId>
+        <artifactId>jaxb-maven-plugin</artifactId>
+        <version>4.0.12</version>
         <configuration>
-          <!-- Necessary to exclude .xjb and .xml files as long as they share same folder as xsd files
-                - otherwise must specify source-files individually -->
-          <xjcSourceExcludeFilters>
-            <filter implementation="org.codehaus.mojo.jaxb2.shared.filters.pattern.PatternFileFilter">
-              <patterns>
-                <pattern>\.xjb</pattern>
-                <pattern>\.xml</pattern>
-              </patterns>
-            </filter>
-          </xjcSourceExcludeFilters>
+          <schemaDirectory>${project.basedir}/src/main/resources/xsd/</schemaDirectory>
           <extension>true</extension>
-          <arguments>
-            <argument>-XtoString</argument>
-            <argument>-Xequals</argument>
-            <argument>-XhashCode</argument>
-            <argument>-Xannotate</argument>
-          </arguments>
+          <args>
+            <arg>-XtoString</arg>
+            <arg>-XsimpleEquals</arg>
+            <arg>-XsimpleHashCode</arg>
+          </args>
+          <plugins>
+            <plugin>
+              <groupId>org.jvnet.jaxb</groupId>
+              <artifactId>jaxb-plugins</artifactId>
+              <version>4.0.12</version>
+            </plugin>
+          </plugins>
         </configuration>
         <executions>
           <execution>
             <id>generate-message-classes</id>
             <goals>
-              <goal>xjc</goal>
+              <goal>generate</goal>
             </goals>
             <phase>process-sources</phase>
             <configuration>
-              <outputDirectory>${project.build.directory}/generated-sources/messages</outputDirectory>
-              <sources>
-                <source>${project.build.directory}/message-xml/xsd</source>
-              </sources>
-              <xjbSources>
-                <xjbSource>${project.build.directory}/message-xml/xsd/bindings.xjb</xjbSource>
-              </xjbSources>
+              <generateDirectory>${project.build.directory}/generated-sources/messages</generateDirectory>
+              <schemaDirectory>${project.build.directory}/message-xml/xsd</schemaDirectory>
+              <bindingIncludes>bindings.xjb</bindingIncludes>
             </configuration>
           </execution>
           <execution>
             <id>generate-message-versioning-classes</id>
             <goals>
-              <goal>xjc</goal>
+              <goal>generate</goal>
             </goals>
             <phase>process-sources</phase>
             <configuration>
-              <outputDirectory>${project.build.directory}/generated-sources/versioning</outputDirectory>
-              <sources>
-                <source>${project.build.directory}/message-xml/versioning</source>
-              </sources>
+              <generateDirectory>${project.build.directory}/generated-sources/versioning</generateDirectory>
+              <schemaDirectory>${project.build.directory}/message-xml/versioning</schemaDirectory>
             </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.jvnet.jaxb2_commons</groupId>
-            <artifactId>jaxb2-basics</artifactId>
-            <version>0.11.1</version>
-          </dependency>
-          <dependency>
-            <groupId>org.jvnet.jaxb2_commons</groupId>
-            <artifactId>jaxb2-basics-annotate</artifactId>
-            <version>1.1.0</version>
-          </dependency>
-        </dependencies>
+
+
       </plugin>
+
     </plugins>
   </build>
 </project>
diff --git a/pom.xml b/pom.xml
index f4aec88..ef7ee19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         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>
 
   <parent>
@@ -58,4 +59,15 @@
     <additionalparam>-Xdoclint:none</additionalparam>
   </properties>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <release>21</release>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>