diff --git a/common/pom.xml b/common/pom.xml
index b6f8f161..0ee6af54 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -62,6 +62,12 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<scope>compile</scope>
+		</dependency>
+
 		<!-- Testing -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
diff --git a/common/src/main/java/systems/uom/common/spi/CommonServiceProvider.java b/common/src/main/java/systems/uom/common/spi/CommonServiceProvider.java
index c2d08e46..2ac54f59 100644
--- a/common/src/main/java/systems/uom/common/spi/CommonServiceProvider.java
+++ b/common/src/main/java/systems/uom/common/spi/CommonServiceProvider.java
@@ -30,7 +30,7 @@
 package systems.uom.common.spi;
 import static systems.uom.common.spi.ServiceConstants.*;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 import jakarta.inject.Named;
 import javax.measure.spi.ServiceProvider;
 import javax.measure.spi.SystemOfUnitsService;
@@ -40,7 +40,7 @@
  * This class implements the {@link ServiceProvider} interface and hereby uses the JDK {@link java.util.ServiceLoader} to load the services required.
  *
  * @author Werner Keil
- * @version 2.0
+ * @version 2.1
  */
 @Named(NAME)
 @Priority(PRIO)
diff --git a/common/src/main/jdk9/module-info.java b/common/src/main/jdk9/module-info.java
index 559225ca..e10f1320 100644
--- a/common/src/main/jdk9/module-info.java
+++ b/common/src/main/jdk9/module-info.java
@@ -31,7 +31,7 @@
     requires transitive java.measure;
     requires transitive si.uom.quantity;       
     requires transitive tech.uom.lib.common;
-    requires transitive java.annotation;
+    requires transitive jakarta.annotation;
     requires transitive jakarta.inject;
     requires transitive systems.uom.quantity;
     requires tech.units.indriya;
diff --git a/pom.xml b/pom.xml
index 6587b636..41d276a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,6 +9,7 @@
 		<artifactId>uom-parent</artifactId>
 		<version>2.2</version>
 	</parent>
+	<version>2.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Units of Measurement Systems Parent</name>
 	<url>http://www.uom.systems</url>
@@ -32,9 +33,10 @@
 		<lib.version>2.2</lib.version>
 		<jsr.version>2.2</jsr.version>
 		<ri.version>2.2</ri.version>
-		<si.version>2.1</si.version>
+		<si.version>2.2-SNAPSHOT</si.version>
 		<quantity.version>2.2-SNAPSHOT</quantity.version><!-- only need to change when new quantities added -->
 		<systems.version>2.2-SNAPSHOT</systems.version>
+		<jakarta.annotation.version>2.0.0</jakarta.annotation.version>
 		<project.build.javaVersion>${jdkVersion}</project.build.javaVersion>
 		<maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
 		<maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
@@ -214,6 +216,12 @@
 				<version>${si.version}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>jakarta.annotation</groupId>
+				<artifactId>jakarta.annotation-api</artifactId>
+				<version>${jakarta.annotation.version}</version>
+				<scope>compile</scope>
+			</dependency>
 
 			<!-- OSGI support -->
 			<dependency>
@@ -312,11 +320,12 @@
 					<plugin>
 						<groupId>org.reficio</groupId>
 						<artifactId>p2-maven-plugin</artifactId>
-						<version>1.6.0</version>
+						<version>2.1.0</version>
 						<executions>
 							<execution>
 								<id>default-cli</id>
 								<configuration>
+									<label>Unit Systems</label>
 									<artifacts>
 										<!-- specify your depencies here -->
 										<artifact>
@@ -349,5 +358,4 @@
 			</build>
 		</profile>
 	</profiles>		
-	<version>2.2-SNAPSHOT</version>
 </project>
\ No newline at end of file
diff --git a/src/main/config/uom-systems p2.launch b/src/main/config/uom-systems p2.launch
index 7f2dfa76..741075d9 100644
--- a/src/main/config/uom-systems p2.launch	
+++ b/src/main/config/uom-systems p2.launch	
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+    <intAttribute key="M2_COLORS" value="0"/>
     <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
     <stringAttribute key="M2_GOALS" value="clean p2:site"/>
     <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
@@ -12,9 +13,11 @@
     <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="true"/>
     <stringAttribute key="M2_USER_SETTINGS" value=""/>
     <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:systems-parent}"/>
 </launchConfiguration>
diff --git a/ucum/pom.xml b/ucum/pom.xml
index 42bd3790..9fcdb507 100644
--- a/ucum/pom.xml
+++ b/ucum/pom.xml
@@ -91,6 +91,11 @@
 		  <artifactId>jakarta.inject-api</artifactId>
 		  <version>2.0.1</version>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<scope>compile</scope>
+		</dependency>
 		
 		<!-- Testing -->
 		<dependency>
diff --git a/ucum/src/etc/jdk9/module-info.java b/ucum/src/etc/jdk9/module-info.java
deleted file mode 100644
index 2cd66724..00000000
--- a/ucum/src/etc/jdk9/module-info.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Units of Measurement Systems
- * Copyright (c) 2005-2019, Jean-Marie Dautelle, Werner Keil and others.
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions
- *    and the following disclaimer in the documentation and/or other materials provided with the distribution.
- *
- * 3. Neither the name of JSR-385, Units of Measurement nor the names of their contributors may be used to
- *    endorse or promote products derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-module systems.uom.ucum {
-    requires transitive java.measure;
-    requires transitive si.uom.quantity;
-    requires transitive si.uom.units;
-    requires transitive tech.units.indriya;
-    requires transitive java.annotation;
-    requires transitive systems.uom.quantity;
-    
-    exports systems.uom.ucum;
-    exports systems.uom.ucum.format;
-    exports systems.uom.ucum.spi;
-    
-    provides javax.measure.spi.ServiceProvider with
-    	systems.uom.ucum.spi.UCUMServiceProvider;
-    
-    provides javax.measure.spi.FormatService with
-    	systems.uom.ucum.spi.UCUMFormatService;
-    
-    provides javax.measure.spi.SystemOfUnitsService with
-	systems.uom.ucum.spi.UCUMSystemService;
-}
\ No newline at end of file
diff --git a/ucum/src/main/jdk9/module-info.java b/ucum/src/main/jdk9/module-info.java
index b921c4e5..23ada407 100644
--- a/ucum/src/main/jdk9/module-info.java
+++ b/ucum/src/main/jdk9/module-info.java
@@ -32,7 +32,7 @@
     requires transitive si.uom.quantity;
     requires transitive si.uom.units;
     requires transitive tech.units.indriya;
-    requires transitive java.annotation;
+    requires transitive jakarta.annotation;
     requires transitive systems.uom.quantity;
     
     exports systems.uom.ucum;