diff --git a/pom.xml b/pom.xml
index d31e806..16e417c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,12 +26,12 @@
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
-			<version>2.4.0-b180830.0438</version>
+			<version>4.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.15</version>
+			<version>1.16.0</version>
 		</dependency>
 	</dependencies>
 
@@ -53,6 +53,14 @@
 			</resource>
 		</resources>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.3.1</version>
+				<configuration>
+					<propertiesEncoding>${project.build.sourceEncoding}</propertiesEncoding>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>io.github.fvarrui</groupId>
 				<artifactId>javapackager</artifactId>
@@ -72,6 +80,9 @@
 								<additionalResource>samples</additionalResource>
 							</additionalResources>
 							<url>https://asir-fuw.github.io/Makinito</url>
+							<winConfig>
+								<generateMsi>false</generateMsi>
+							</winConfig>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/src/main/java/io/github/fvarrui/makinito/hardware/microcode/Condition.java b/src/main/java/io/github/fvarrui/makinito/hardware/microcode/Condition.java
index 23d1264..6e01578 100644
--- a/src/main/java/io/github/fvarrui/makinito/hardware/microcode/Condition.java
+++ b/src/main/java/io/github/fvarrui/makinito/hardware/microcode/Condition.java
@@ -1,7 +1,7 @@
 package io.github.fvarrui.makinito.hardware.microcode;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType
 public class Condition {
diff --git a/src/main/java/io/github/fvarrui/makinito/hardware/microcode/InstructionSet.java b/src/main/java/io/github/fvarrui/makinito/hardware/microcode/InstructionSet.java
index f679a23..9699289 100644
--- a/src/main/java/io/github/fvarrui/makinito/hardware/microcode/InstructionSet.java
+++ b/src/main/java/io/github/fvarrui/makinito/hardware/microcode/InstructionSet.java
@@ -5,17 +5,17 @@
 import java.util.ArrayList;
 import java.util.Map;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import io.github.fvarrui.makinito.hardware.Makinito;
 import io.github.fvarrui.makinito.software.AddressingMode;
 import io.github.fvarrui.makinito.software.Instruction;
 import io.github.fvarrui.makinito.software.Operand;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
 @XmlRootElement
 public class InstructionSet {
 	private ArrayList<MicroProgram> microprograms;
diff --git a/src/main/java/io/github/fvarrui/makinito/hardware/microcode/MacroInstruction.java b/src/main/java/io/github/fvarrui/makinito/hardware/microcode/MacroInstruction.java
index fa76414..66e90ec 100644
--- a/src/main/java/io/github/fvarrui/makinito/hardware/microcode/MacroInstruction.java
+++ b/src/main/java/io/github/fvarrui/makinito/hardware/microcode/MacroInstruction.java
@@ -4,8 +4,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType
 public class MacroInstruction extends MicroInstruction {
diff --git a/src/main/java/io/github/fvarrui/makinito/hardware/microcode/MicroInstruction.java b/src/main/java/io/github/fvarrui/makinito/hardware/microcode/MicroInstruction.java
index a378a98..b4db125 100644
--- a/src/main/java/io/github/fvarrui/makinito/hardware/microcode/MicroInstruction.java
+++ b/src/main/java/io/github/fvarrui/makinito/hardware/microcode/MicroInstruction.java
@@ -1,8 +1,8 @@
 package io.github.fvarrui.makinito.hardware.microcode;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType
 @XmlSeeAlso({ MacroInstruction.class, SignalInstruction.class })
diff --git a/src/main/java/io/github/fvarrui/makinito/hardware/microcode/MicroParameter.java b/src/main/java/io/github/fvarrui/makinito/hardware/microcode/MicroParameter.java
index 9094f1d..9b6c3b1 100644
--- a/src/main/java/io/github/fvarrui/makinito/hardware/microcode/MicroParameter.java
+++ b/src/main/java/io/github/fvarrui/makinito/hardware/microcode/MicroParameter.java
@@ -1,7 +1,7 @@
 package io.github.fvarrui.makinito.hardware.microcode;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType(propOrder = { "name", "value" })
 public class MicroParameter {
diff --git a/src/main/java/io/github/fvarrui/makinito/hardware/microcode/MicroProgram.java b/src/main/java/io/github/fvarrui/makinito/hardware/microcode/MicroProgram.java
index 613093c..126dee3 100644
--- a/src/main/java/io/github/fvarrui/makinito/hardware/microcode/MicroProgram.java
+++ b/src/main/java/io/github/fvarrui/makinito/hardware/microcode/MicroProgram.java
@@ -3,11 +3,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlType;
+
 
 @XmlType
 public class MicroProgram {
diff --git a/src/main/java/io/github/fvarrui/makinito/hardware/microcode/Parameter.java b/src/main/java/io/github/fvarrui/makinito/hardware/microcode/Parameter.java
index ca83d92..f160573 100644
--- a/src/main/java/io/github/fvarrui/makinito/hardware/microcode/Parameter.java
+++ b/src/main/java/io/github/fvarrui/makinito/hardware/microcode/Parameter.java
@@ -1,9 +1,8 @@
 package io.github.fvarrui.makinito.hardware.microcode;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
 import io.github.fvarrui.makinito.software.AddressingMode;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType
 public class Parameter {
diff --git a/src/main/java/io/github/fvarrui/makinito/hardware/microcode/SignalInstruction.java b/src/main/java/io/github/fvarrui/makinito/hardware/microcode/SignalInstruction.java
index cf5d588..2d800b0 100644
--- a/src/main/java/io/github/fvarrui/makinito/hardware/microcode/SignalInstruction.java
+++ b/src/main/java/io/github/fvarrui/makinito/hardware/microcode/SignalInstruction.java
@@ -1,6 +1,6 @@
 package io.github.fvarrui.makinito.hardware.microcode;
 
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType
 public class SignalInstruction extends MicroInstruction {