diff --git a/.github/workflows/maven-acceptance-manual.yml b/.github/workflows/maven-acceptance-manual.yml
index fd8a25b4..be017276 100644
--- a/.github/workflows/maven-acceptance-manual.yml
+++ b/.github/workflows/maven-acceptance-manual.yml
@@ -60,3 +60,117 @@ jobs:
       - name: Run tests on RefImpl
         run: mvn -B -Pacceptance clean verify --file main/src/pom.xml
 
+
+  docker-compose-e2e:
+    runs-on: [ubuntu-latest]
+    timeout-minutes: 15
+    strategy:
+      fail-fast: false
+      matrix:
+        # jdk: ['11']
+        # distribution: ['temurin', 'corretto', 'microsoft', 'adopt-openj9', 'zulu']
+        # experimental: [false]
+        include:
+          - jdk: '17'
+            distribution: 'zulu'
+            experimental: false
+          # - jdk: '19'
+          #   distribution: 'zulu'
+          #   experimental: true
+    continue-on-error: ${{ matrix.experimental }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: eclipse/lyo
+          ref: "${{ github.event.inputs.lyoBranch }}"
+          path: lyo-trunk
+      - uses: actions/checkout@v4
+        with:
+          path: main
+      - name: Set up JDK ${{ matrix.jdk }}
+        uses: actions/setup-java@v4
+        with:
+          distribution: ${{ matrix.distribution }}
+          java-version: ${{ matrix.jdk }}
+      - uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-
+      - name: Build Lyo locally (branch ${{ github.event.inputs.lyoBranch }})
+        run: mvn -B clean install --file lyo-trunk/pom.xml -DskipTests -Dmaven.javadoc.skip=true
+      - name: Build with Maven
+        run: mvn -B package --file main/src/pom.xml
+      - name: Build and Start Docker Compose
+        working-directory: main/src/
+        run: |
+          docker-compose build
+          docker-compose up -d
+      - name: Wait for Services to Start
+        run: sleep 30  # Adjust as needed
+      - name: Test RM SPC endpoint with curl
+        run: curl -fsSL --user "admin:admin" http://localhost:8800/services/catalog/singleton
+        continue-on-error: true  # Continue even if curl command fails
+      - name: Tear down Docker Compose
+        working-directory: main/src/
+        run: docker-compose down
+
+
+  docker-compose-e2e-tomcat:
+    runs-on: [ubuntu-latest]
+    timeout-minutes: 15
+    strategy:
+      fail-fast: false
+      matrix:
+        # jdk: ['11']
+        # distribution: ['temurin', 'corretto', 'microsoft', 'adopt-openj9', 'zulu']
+        # experimental: [false]
+        include:
+          - jdk: '17'
+            distribution: 'zulu'
+            experimental: false
+          # - jdk: '19'
+          #   distribution: 'zulu'
+          #   experimental: true
+    continue-on-error: ${{ matrix.experimental }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: eclipse/lyo
+          ref: "${{ github.event.inputs.lyoBranch }}"
+          path: lyo-trunk
+      - uses: actions/checkout@v4
+        with:
+          path: main
+      - name: Set up JDK ${{ matrix.jdk }}
+        uses: actions/setup-java@v4
+        with:
+          distribution: ${{ matrix.distribution }}
+          java-version: ${{ matrix.jdk }}
+      - uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-
+      - name: Build Lyo locally (branch ${{ github.event.inputs.lyoBranch }})
+        working-directory: lyo-trunk/
+        run: mvn -B clean install -DskipTests -Dmaven.javadoc.skip=true
+      - name: Build with Maven
+        working-directory: main/src/
+        run: mvn -B package -Pwith-jstl-impl
+      - name: Build and Start Docker Compose
+        working-directory: main/src/
+        run: |
+          docker-compose -f docker-compose.tomcat.yml build
+          docker-compose -f docker-compose.tomcat.yml up -d
+      - name: Wait for Services to Start
+        run: sleep 30  # Adjust as needed
+      - name: Test RM SPC endpoint with curl
+        run: curl -fsSL --user "admin:admin" http://localhost:8800/services/catalog/singleton
+      - name: Tear down Docker Compose
+        working-directory: main/src/
+        run: docker-compose  -f docker-compose.tomcat.yml down
diff --git a/.github/workflows/maven-acceptance.yml b/.github/workflows/maven-acceptance.yml
index 8b26858a..e850daa2 100644
--- a/.github/workflows/maven-acceptance.yml
+++ b/.github/workflows/maven-acceptance.yml
@@ -132,7 +132,7 @@ jobs:
       # - name: Set up Docker
       #   uses: docker/setup-docker@v2
       - name: Build with Maven
-        run: mvn -B package --file src/pom.xml
+        run: mvn -B package --file src/pom.xml -Pwith-jstl-impl
       - name: Build and Start Docker Compose
         working-directory: src/
         run: |
diff --git a/README.md b/README.md
index 41da7b8d..9208c239 100644
--- a/README.md
+++ b/README.md
@@ -126,7 +126,7 @@ cd src/
 mvn clean install
 
 cd server-rm/
-mvn clean package
+mvn clean package -Pwith-jstl-impl
 docker build -f tomcat.Dockerfile -t refimpl-server-rm .
 docker run -p 8800:8080 refimpl-server-rm
 ```
@@ -141,16 +141,16 @@ mvn clean install
 # mvn clean verify -Pacceptance
 
 cd server-rm/
-mvn cargo:run
+mvn clean package cargo:run -D"cargo.maven.containerId=tomcat10x" -Pwith-jstl-impl
 
 cd ../server-cm/
-mvn cargo:run
+mvn clean package cargo:run -D"cargo.maven.containerId=tomcat10x" -Pwith-jstl-impl
 
 cd ../server-qm/
-mvn cargo:run
+mvn clean package cargo:run -D"cargo.maven.containerId=tomcat10x" -Pwith-jstl-impl
 
 cd ../server-am/
-mvn cargo:run
+mvn clean package cargo:run -D"cargo.maven.containerId=tomcat10x" -Pwith-jstl-impl
 
 ```
 ## Populate with sample data
diff --git a/src/client-toolchain/pom.xml b/src/client-toolchain/pom.xml
index a82cae44..e8971c66 100644
--- a/src/client-toolchain/pom.xml
+++ b/src/client-toolchain/pom.xml
@@ -17,9 +17,9 @@
     <maven.compiler.target>17</maven.compiler.target>
 
     <v.kotlin>1.8.20</v.kotlin>
-    <v.lyo>6.0.0.Alpha1</v.lyo>
+    <v.lyo>6.0.0-SNAPSHOT</v.lyo>
 <!--    <v.lyo.oslc-ui>${v.lyo}</v.lyo.oslc-ui>-->
-    <v.jersey>2.35</v.jersey>
+    <v.jersey>3.1.5</v.jersey>
     <v.kotlin.coroutines>1.6.4</v.kotlin.coroutines>
   </properties>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.7.33</version>
+      <version>1.7.36</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -75,8 +75,8 @@
       <exclusions>
         <exclusion>
           <!-- Jakarta API is used in Lyo Client -->
-          <groupId>javax.ws.rs</groupId>
-          <artifactId>javax.ws.rs-api</artifactId>
+          <groupId>jakarta.ws.rs</groupId>
+          <artifactId>jakarta.ws.rs-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
diff --git a/src/client-toolchain/src/main/kotlin/co/oslc/refimpl/client/Main.kt b/src/client-toolchain/src/main/kotlin/co/oslc/refimpl/client/Main.kt
index deae6bf3..42a123ba 100644
--- a/src/client-toolchain/src/main/kotlin/co/oslc/refimpl/client/Main.kt
+++ b/src/client-toolchain/src/main/kotlin/co/oslc/refimpl/client/Main.kt
@@ -27,8 +27,8 @@ import java.net.ConnectException
 import java.net.URI
 import java.util.*
 import javax.net.ssl.SSLContext
-import javax.ws.rs.client.ClientBuilder
-import javax.ws.rs.core.Response
+import jakarta.ws.rs.client.ClientBuilder
+import jakarta.ws.rs.core.Response
 import kotlin.collections.HashSet
 import kotlin.system.measureNanoTime
 
diff --git a/src/docker-compose.tomcat.yml b/src/docker-compose.tomcat.yml
index 7aef56bd..fbf86016 100644
--- a/src/docker-compose.tomcat.yml
+++ b/src/docker-compose.tomcat.yml
@@ -7,14 +7,20 @@ services:
     ports:
       - "8800:8080"
   server-cm:
-    build: server-cm/
+    build:
+      context: server-cm/
+      dockerfile: tomcat.Dockerfile
     ports:
       - "8801:8080"
   server-qm:
-    build: server-qm/
+    build:
+      context: server-qm/
+      dockerfile: tomcat.Dockerfile
     ports:
       - "8802:8080"
   server-am:
-    build: server-am/
+    build:
+      context: server-am/
+      dockerfile: tomcat.Dockerfile
     ports:
       - "8803:8080"
diff --git a/src/lib-common/pom.xml b/src/lib-common/pom.xml
index a115167d..e33d6c35 100644
--- a/src/lib-common/pom.xml
+++ b/src/lib-common/pom.xml
@@ -19,9 +19,10 @@
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
 
-    <version.lyo>6.0.0.Alpha1</version.lyo>
+    <version.lyo>6.0.0-SNAPSHOT</version.lyo>
 <!--    <version.lyo>5.0.1.CR</version.lyo>-->
-    <version.jersey>2.35</version.jersey>
+    <v.jakarta.servlet.api>6.0.0</v.jakarta.servlet.api>
+    <version.jersey>3.1.5</version.jersey>
   </properties>
 
   <repositories>
@@ -39,7 +40,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.7.33</version>
+      <version>1.7.36</version>
       <scope>runtime</scope>
     </dependency>
 
@@ -77,8 +78,8 @@
       <version>${version.jersey}</version>
       <exclusions>
         <exclusion>
-          <groupId>javax.ws.rs</groupId>
-          <artifactId>javax.ws.rs-api</artifactId>
+          <groupId>jakarta.ws.rs</groupId>
+          <artifactId>jakarta.ws.rs-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -88,27 +89,27 @@
       <version>${version.jersey}</version>
       <exclusions>
         <exclusion>
-          <groupId>javax.ws.rs</groupId>
-          <artifactId>javax.ws.rs-api</artifactId>
+          <groupId>jakarta.ws.rs</groupId>
+          <artifactId>jakarta.ws.rs-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>${v.jakarta.servlet.api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>jakarta.servlet.jsp.jstl</groupId>
       <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-      <version>1.2.7</version>
+      <version>3.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>javax.ws.rs-api</artifactId>
-      <version>2.0.1</version>
+      <groupId>jakarta.ws.rs</groupId>
+      <artifactId>jakarta.ws.rs-api</artifactId>
+      <version>3.1.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/src/lib-common/src/main/java/co/oslc/refimpl/lib/MemResourceRepository.java b/src/lib-common/src/main/java/co/oslc/refimpl/lib/MemResourceRepository.java
index 897a35a6..cf190cb3 100644
--- a/src/lib-common/src/main/java/co/oslc/refimpl/lib/MemResourceRepository.java
+++ b/src/lib-common/src/main/java/co/oslc/refimpl/lib/MemResourceRepository.java
@@ -9,9 +9,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
-import javax.xml.bind.DatatypeConverter;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
+import jakarta.xml.bind.DatatypeConverter;
 import javax.xml.datatype.DatatypeConfigurationException;
 import java.io.StringWriter;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/server-am/.dockerignore b/src/server-am/.dockerignore
index a093a3de..286ab7bb 100644
--- a/src/server-am/.dockerignore
+++ b/src/server-am/.dockerignore
@@ -1,2 +1,4 @@
-**/*
+overlays/
+src/
+target/**/*
 !target/*.war
diff --git a/src/server-am/Dockerfile b/src/server-am/Dockerfile
index 8f02ac63..f0f5a4ae 100644
--- a/src/server-am/Dockerfile
+++ b/src/server-am/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/jetty:10-jre17
+FROM docker.io/library/jetty:11-jre17
 # WARNING DO NOT CHANGE WORKDIR or set it back to what it was before
 # $JETTY_BASE must be correct before starting Jetty
 
diff --git a/src/server-am/config/tomcat-log.properties b/src/server-am/config/tomcat-log.properties
new file mode 100644
index 00000000..5876dc1b
--- /dev/null
+++ b/src/server-am/config/tomcat-log.properties
@@ -0,0 +1,21 @@
+# Docker log config to make sure Tomcat logs everything to Docker!
+
+handlers = java.util.logging.ConsoleHandler
+
+.handlers = java.util.logging.ConsoleHandler
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.OneLineFormatter
+java.util.logging.ConsoleHandler.encoding = UTF-8
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = \
+   java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = \
+   java.util.logging.ConsoleHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
diff --git a/src/server-am/pom.xml b/src/server-am/pom.xml
index 4030d55a..4d7610a9 100644
--- a/src/server-am/pom.xml
+++ b/src/server-am/pom.xml
@@ -19,9 +19,9 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.release>17</maven.compiler.release>
-        <version.lyo>6.0.0.Alpha1</version.lyo>
-        <jersey.version>2.35</jersey.version>
-        <swagger.version>2.2.7</swagger.version>
+        <version.lyo>6.0.0-SNAPSHOT</version.lyo>
+        <jersey.version>3.1.5</jersey.version>
+        <swagger.version>2.2.20</swagger.version>
         <swagger-ui.version>3.52.5</swagger-ui.version>
         <servlet.port>8803</servlet.port>
         <application.contextpath>/</application.contextpath>
@@ -48,9 +48,9 @@
         </repository>
         
     </repositories>
-    <!-- Start of user code pre_dependencies
-    -->
     <profiles>
+        <!-- Start of user code profiles
+        -->
       <profile>
         <id>strict</id>
         <build>
@@ -105,7 +105,34 @@
           </plugins>
         </build>
       </profile>
+        <!-- End of user code
+        -->
+        <profile>
+        <!-- some servlet containers (Tomcat) does not ship with a JSTL impl
+        In such cases, run with this profile-->
+            <id>with-jstl-impl</id>
+            <dependencies>
+              <!-- Start of user code profile_dependencies
+              -->
+              <!-- TODO: Add additional dependencies to this profile here to avoid them be overridden upon future re-generation -->
+              <!-- End of user code
+              -->
+              <dependency>
+                  <groupId>jakarta.servlet.jsp.jstl</groupId>
+                  <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+                  <version>3.0.0</version>
+              </dependency>
+              <dependency>
+                  <groupId>org.glassfish.web</groupId>
+                  <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+                  <version>3.0.1</version>
+              </dependency>
+            </dependencies>
+        </profile>
+        
     </profiles>
+    <!-- Start of user code pre_dependencies
+    -->
     <!-- End of user code
     -->
     <dependencies>
@@ -128,22 +155,25 @@
         </dependency>
         <!-- Servlet dependencies -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.servlet.jsp.jstl</groupId>
             <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-            <version>1.2.5</version>
+            <version>3.0.0</version>
+            <!--When running with the jetty-maven-plugin, you 
+            get warnings about jsp classes being scanned from multiple locations.
+            adding the "provided" scope avoids these warnings.-->
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.hk2.external</groupId>
             <artifactId>jakarta.inject</artifactId>
             <version>2.6.1</version>
         </dependency>
-        
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-server</artifactId>
@@ -183,7 +213,7 @@
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
-            <version>4.0.2</version>
+            <version>4.0.5</version>
             <scope>runtime</scope>
         </dependency>
         <!-- Lyo dependencies -->
@@ -232,7 +262,7 @@
         <!-- Swagger dependencies -->
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-jaxrs2</artifactId>
+            <artifactId>swagger-jaxrs2-jakarta</artifactId>
             <version>${swagger.version}</version>
             <exclusions>
                 <exclusion>
@@ -244,7 +274,7 @@
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-jaxrs2-servlet-initializer-v2</artifactId>
+            <artifactId>swagger-jaxrs2-servlet-initializer-v2-jakarta</artifactId>
             <version>${swagger.version}</version>
         </dependency>
         <!-- Start of user code dependencies_final
@@ -268,7 +298,7 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>10.0.7</version>
+                <version>11.0.20</version>
                 <configuration>
                   <webApp>
                     <contextPath>${application.contextpath}</contextPath>
@@ -285,15 +315,13 @@
             <plugin>
                 <groupId>org.codehaus.cargo</groupId>
                 <artifactId>cargo-maven3-plugin</artifactId>
-                <version>1.10.6</version>
+                <version>1.10.12</version>
                 <configuration>
                     <!--This plugins supports the following containers-->
                     <container>
                         <!--These containers are know to work-->
-                        <containerId>tomcat9x</containerId>
-                        <!-- <containerId>jetty10x</containerId> -->
-                        <!-- <containerId>jetty9x</containerId> -->
-                        <!-- <containerId>tomee8x</containerId> -->
+                        <containerId>tomcat10x</containerId>
+                        <containerId>jetty12x</containerId>
                         <!-- <containerId>payara</containerId> -->
                         <!-- <containerId>wildfly26x</containerId> -->
                         <!--These containers are know to fail-->
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/ResourcesFactory.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/ResourcesFactory.java
index 043c4943..04b36e45 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/ResourcesFactory.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/ResourcesFactory.java
@@ -24,7 +24,7 @@
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.model.Link;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/RestDelegate.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/RestDelegate.java
index a66871a0..c6fc99b3 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/RestDelegate.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/RestDelegate.java
@@ -25,9 +25,9 @@
 package co.oslc.refimpl.am.gen;
 
 
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.ServletContextEvent;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContextEvent;
 import java.util.List;
 import java.util.ArrayList;
 import org.slf4j.Logger;
@@ -49,8 +49,8 @@
 import java.util.Date;
 import java.util.UUID;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
 
 import co.oslc.refimpl.lib.MemResourceRepository;
 import co.oslc.refimpl.lib.ResourceRepository;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/auth/AuthenticationApplication.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/auth/AuthenticationApplication.java
index 2ecc760e..01a4ec69 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/auth/AuthenticationApplication.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/auth/AuthenticationApplication.java
@@ -22,9 +22,9 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/clients/GenericRequiredAdaptorClient.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/clients/GenericRequiredAdaptorClient.java
index f59b9031..4391ba35 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/clients/GenericRequiredAdaptorClient.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/clients/GenericRequiredAdaptorClient.java
@@ -19,7 +19,7 @@
 
 package co.oslc.refimpl.am.gen.clients;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import org.eclipse.lyo.client.OSLCConstants;
 import org.eclipse.lyo.client.OslcClient;
 import org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/LinksService.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/LinksService.java
index 7c72f91f..4d484b2d 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/LinksService.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/LinksService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourceShapeService.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourceShapeService.java
index 2cad5200..63079706 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourceShapeService.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourceShapeService.java
@@ -28,20 +28,20 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
@@ -64,7 +64,7 @@ public class ResourceShapeService
     @Context private HttpServletRequest httpServletRequest;
     @Context private HttpServletResponse httpServletResponse;
     @Context private UriInfo uriInfo;
-    @Context private javax.ws.rs.core.Application jaxrsApplication; 
+    @Context private jakarta.ws.rs.core.Application jaxrsApplication; 
 
     private static final Logger log = LoggerFactory.getLogger(ResourceShapeService.class.getName());
 
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourcesService.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourcesService.java
index 7b069317..99808cb6 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourcesService.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourcesService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/RootServicesService.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/RootServicesService.java
index f1cdf2ae..c600547f 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/RootServicesService.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/RootServicesService.java
@@ -16,17 +16,17 @@
 
 package co.oslc.refimpl.am.gen.services;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import co.oslc.refimpl.am.gen.ServerConstants;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ServiceProviderCatalogService.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ServiceProviderCatalogService.java
index 4a9e11c7..88ff47ea 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ServiceProviderCatalogService.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ServiceProviderCatalogService.java
@@ -29,19 +29,19 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.Response;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.Response;
 
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ServiceProviderService.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ServiceProviderService.java
index b5443b20..f725ba79 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ServiceProviderService.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ServiceProviderService.java
@@ -27,18 +27,18 @@
 
 import java.io.IOException;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response.Status;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/WsLinkType.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/WsLinkType.java
index f1dcbcaa..139546b6 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/WsLinkType.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/WsLinkType.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/WsResource.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/WsResource.java
index d32c2332..396366b2 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/WsResource.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/WsResource.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java
index a2387cc5..cf8141c0 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java
@@ -30,7 +30,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
 
@@ -87,11 +87,11 @@
 // End of user code
 
 /**
- * Generated by Lyo Designer 6.0.0.202310032221
+ * Generated by Lyo Designer 6.0.0.qualifier
  */
 
 @OpenAPIDefinition(info = @Info(title = "AM", version = "1.0.0"), servers = @Server(url = "/services/"))
-public class Application extends javax.ws.rs.core.Application {
+public class Application extends jakarta.ws.rs.core.Application {
 
     private static final Set<Class<?>>         RESOURCE_CLASSES                          = new HashSet<Class<?>>();
     private static final Map<String, Class<?>> RESOURCE_SHAPE_PATH_TO_RESOURCE_CLASS_MAP = new HashMap<String, Class<?>>();
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ApplicationBinder.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ApplicationBinder.java
index aa8f1569..b3b4eeb1 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ApplicationBinder.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ApplicationBinder.java
@@ -22,7 +22,7 @@
 import org.glassfish.hk2.api.Factory;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import co.oslc.refimpl.am.gen.RestDelegate;
 import co.oslc.refimpl.am.gen.ResourcesFactory;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/CredentialsFilter.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/CredentialsFilter.java
index a2728221..0d87c130 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/CredentialsFilter.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/CredentialsFilter.java
@@ -24,15 +24,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import net.oauth.OAuth;
 import net.oauth.OAuthException;
 import net.oauth.OAuthMessage;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProviderCatalogSingleton.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProviderCatalogSingleton.java
index 2530b0bf..3b25e211 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProviderCatalogSingleton.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProviderCatalogSingleton.java
@@ -34,10 +34,10 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.Service;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProvidersFactory.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProvidersFactory.java
index 593bc81b..dc4456c5 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProvidersFactory.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProvidersFactory.java
@@ -33,7 +33,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServletListener.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServletListener.java
index b6c6a600..2723f442 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServletListener.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServletListener.java
@@ -31,11 +31,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletRegistration;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletRegistration;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import co.oslc.refimpl.am.gen.RestDelegate;
diff --git a/src/server-am/src/main/webapp/WEB-INF/web.xml b/src/server-am/src/main/webapp/WEB-INF/web.xml
index 0eb8d674..873bff2b 100644
--- a/src/server-am/src/main/webapp/WEB-INF/web.xml
+++ b/src/server-am/src/main/webapp/WEB-INF/web.xml
@@ -32,7 +32,7 @@
         <servlet-name>JAX-RS Servlet</servlet-name>
         <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
         <init-param>
-            <param-name>javax.ws.rs.Application</param-name>
+            <param-name>jakarta.ws.rs.Application</param-name>
             <param-value>co.oslc.refimpl.am.gen.servlet.Application</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/creationdialogsampleclient.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/creationdialogsampleclient.jsp
index 5fb106cb..d621ec4c 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/creationdialogsampleclient.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/creationdialogsampleclient.jsp
@@ -16,7 +16,7 @@
  This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
 --%>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktype.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktype.jsp
index 41cd4a86..770c4802 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktype.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktype.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.am.LinkType"%>
 <%@page import="org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants"%>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypelargepreview.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypelargepreview.jsp
index 778c427c..84caab4c 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypelargepreview.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypelargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.am.LinkType"%>
 <%@page import="org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants"%>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypescollection.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypescollection.jsp
index 1f344a82..c5a10370 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypescollection.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypescollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypeselector.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypeselector.jsp
index 9cced207..59df063e 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypeselector.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypeselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.am.LinkType"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypesmallpreview.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypesmallpreview.jsp
index f18c1c77..8b7c86e2 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypesmallpreview.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypesmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.am.LinkType"%>
 <%@page import="org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants"%>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resource.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resource.jsp
index 5f5de131..a54bcd66 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resource.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resource.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.am.Resource"%>
 <%@page import="org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants"%>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcelargepreview.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcelargepreview.jsp
index 0c2db808..d5bab363 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcelargepreview.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcelargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.am.Resource"%>
 <%@page import="org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants"%>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcescollection.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcescollection.jsp
index 1d15631e..802f5781 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcescollection.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcescollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourceselector.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourceselector.jsp
index 6d97ed30..acb8753d 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourceselector.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourceselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.am.Resource"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourceshape.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourceshape.jsp
index ccec869f..ee139fff 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourceshape.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourceshape.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.Property"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.OslcConstants"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcesmallpreview.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcesmallpreview.jsp
index 8189bfa1..5b84ae89 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcesmallpreview.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcesmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.am.Resource"%>
 <%@page import="org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants"%>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/selectiondialogsampleclient.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/selectiondialogsampleclient.jsp
index 245d1430..728f3248 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/selectiondialogsampleclient.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/selectiondialogsampleclient.jsp
@@ -16,7 +16,7 @@
  This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
 --%>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/serviceprovider.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/serviceprovider.jsp
index 4865080c..913b6fe3 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/serviceprovider.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/serviceprovider.jsp
@@ -26,7 +26,7 @@
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.CreationFactory" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.QueryCapability" %>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/serviceprovidercatalog.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/serviceprovidercatalog.jsp
index a6fe5a6a..5d65c4b0 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/serviceprovidercatalog.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/serviceprovidercatalog.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-am/src/main/webapp/index.jsp b/src/server-am/src/main/webapp/index.jsp
index 5667c7e3..8f3f7865 100644
--- a/src/server-am/src/main/webapp/index.jsp
+++ b/src/server-am/src/main/webapp/index.jsp
@@ -16,7 +16,7 @@
 --%>
 
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="java.net.URI"%>
 
 <%@ page language="java" contentType="text/html; charset=UTF-8"
diff --git a/src/server-am/src/main/webapp/swagger-ui/index.jsp b/src/server-am/src/main/webapp/swagger-ui/index.jsp
index d6c9348c..819280c1 100644
--- a/src/server-am/src/main/webapp/swagger-ui/index.jsp
+++ b/src/server-am/src/main/webapp/swagger-ui/index.jsp
@@ -16,7 +16,7 @@
 --%>
 
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="java.net.URI"%>
 <%@page import="java.io.File"%>
 
diff --git a/src/server-am/tomcat.Dockerfile b/src/server-am/tomcat.Dockerfile
new file mode 100644
index 00000000..2fd72bed
--- /dev/null
+++ b/src/server-am/tomcat.Dockerfile
@@ -0,0 +1,7 @@
+FROM docker.io/library/tomcat:10-jre17
+
+# do not write log files, log everything to the Docker daemon
+COPY config/tomcat-log.properties $CATALINA_BASE/conf/logging.properties
+ENV CATALINA_OUT=/dev/null
+
+COPY target/*.war /usr/local/tomcat/webapps/ROOT.war
diff --git a/src/server-cm/.dockerignore b/src/server-cm/.dockerignore
index a093a3de..286ab7bb 100644
--- a/src/server-cm/.dockerignore
+++ b/src/server-cm/.dockerignore
@@ -1,2 +1,4 @@
-**/*
+overlays/
+src/
+target/**/*
 !target/*.war
diff --git a/src/server-cm/Dockerfile b/src/server-cm/Dockerfile
index 8f02ac63..f0f5a4ae 100644
--- a/src/server-cm/Dockerfile
+++ b/src/server-cm/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/jetty:10-jre17
+FROM docker.io/library/jetty:11-jre17
 # WARNING DO NOT CHANGE WORKDIR or set it back to what it was before
 # $JETTY_BASE must be correct before starting Jetty
 
diff --git a/src/server-cm/config/tomcat-log.properties b/src/server-cm/config/tomcat-log.properties
new file mode 100644
index 00000000..5876dc1b
--- /dev/null
+++ b/src/server-cm/config/tomcat-log.properties
@@ -0,0 +1,21 @@
+# Docker log config to make sure Tomcat logs everything to Docker!
+
+handlers = java.util.logging.ConsoleHandler
+
+.handlers = java.util.logging.ConsoleHandler
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.OneLineFormatter
+java.util.logging.ConsoleHandler.encoding = UTF-8
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = \
+   java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = \
+   java.util.logging.ConsoleHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
diff --git a/src/server-cm/pom.xml b/src/server-cm/pom.xml
index 2a01fbb3..9d31dd5d 100644
--- a/src/server-cm/pom.xml
+++ b/src/server-cm/pom.xml
@@ -19,9 +19,9 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.release>17</maven.compiler.release>
-        <version.lyo>6.0.0.Alpha1</version.lyo>
-        <jersey.version>2.35</jersey.version>
-        <swagger.version>2.2.7</swagger.version>
+        <version.lyo>6.0.0-SNAPSHOT</version.lyo>
+        <jersey.version>3.1.5</jersey.version>
+        <swagger.version>2.2.20</swagger.version>
         <swagger-ui.version>3.52.5</swagger-ui.version>
         <servlet.port>8801</servlet.port>
         <application.contextpath>/</application.contextpath>
@@ -48,9 +48,9 @@
         </repository>
         
     </repositories>
-    <!-- Start of user code pre_dependencies
-    -->
     <profiles>
+        <!-- Start of user code profiles
+        -->
       <profile>
         <id>strict</id>
         <build>
@@ -105,7 +105,34 @@
           </plugins>
         </build>
       </profile>
+        <!-- End of user code
+        -->
+        <profile>
+        <!-- some servlet containers (Tomcat) does not ship with a JSTL impl
+        In such cases, run with this profile-->
+            <id>with-jstl-impl</id>
+            <dependencies>
+              <!-- Start of user code profile_dependencies
+              -->
+              <!-- TODO: Add additional dependencies to this profile here to avoid them be overridden upon future re-generation -->
+              <!-- End of user code
+              -->
+              <dependency>
+                  <groupId>jakarta.servlet.jsp.jstl</groupId>
+                  <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+                  <version>3.0.0</version>
+              </dependency>
+              <dependency>
+                  <groupId>org.glassfish.web</groupId>
+                  <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+                  <version>3.0.1</version>
+              </dependency>
+            </dependencies>
+        </profile>
+        
     </profiles>
+    <!-- Start of user code pre_dependencies
+    -->
     <!-- End of user code
     -->
     <dependencies>
@@ -128,22 +155,25 @@
         </dependency>
         <!-- Servlet dependencies -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.servlet.jsp.jstl</groupId>
             <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-            <version>1.2.5</version>
+            <version>3.0.0</version>
+            <!--When running with the jetty-maven-plugin, you 
+            get warnings about jsp classes being scanned from multiple locations.
+            adding the "provided" scope avoids these warnings.-->
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.hk2.external</groupId>
             <artifactId>jakarta.inject</artifactId>
             <version>2.6.1</version>
         </dependency>
-        
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-server</artifactId>
@@ -183,7 +213,7 @@
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
-            <version>4.0.2</version>
+            <version>4.0.5</version>
             <scope>runtime</scope>
         </dependency>
         <!-- Lyo dependencies -->
@@ -232,7 +262,7 @@
         <!-- Swagger dependencies -->
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-jaxrs2</artifactId>
+            <artifactId>swagger-jaxrs2-jakarta</artifactId>
             <version>${swagger.version}</version>
             <exclusions>
                 <exclusion>
@@ -244,7 +274,7 @@
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-jaxrs2-servlet-initializer-v2</artifactId>
+            <artifactId>swagger-jaxrs2-servlet-initializer-v2-jakarta</artifactId>
             <version>${swagger.version}</version>
         </dependency>
         <!-- OSLC-UI dependencies -->
@@ -274,7 +304,7 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>10.0.7</version>
+                <version>11.0.20</version>
                 <configuration>
                   <webApp>
                     <contextPath>${application.contextpath}</contextPath>
@@ -291,15 +321,13 @@
             <plugin>
                 <groupId>org.codehaus.cargo</groupId>
                 <artifactId>cargo-maven3-plugin</artifactId>
-                <version>1.10.6</version>
+                <version>1.10.12</version>
                 <configuration>
                     <!--This plugins supports the following containers-->
                     <container>
                         <!--These containers are know to work-->
-                        <containerId>tomcat9x</containerId>
-                        <!-- <containerId>jetty10x</containerId> -->
-                        <!-- <containerId>jetty9x</containerId> -->
-                        <!-- <containerId>tomee8x</containerId> -->
+                        <containerId>tomcat10x</containerId>
+                        <containerId>jetty12x</containerId>
                         <!-- <containerId>payara</containerId> -->
                         <!-- <containerId>wildfly26x</containerId> -->
                         <!--These containers are know to fail-->
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/ResourcesFactory.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/ResourcesFactory.java
index 90e46b15..4919c17a 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/ResourcesFactory.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/ResourcesFactory.java
@@ -24,7 +24,7 @@
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.model.Link;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/RestDelegate.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/RestDelegate.java
index 01364040..3def480c 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/RestDelegate.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/RestDelegate.java
@@ -25,13 +25,11 @@
 package co.oslc.refimpl.cm.gen;
 
 
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.ServletContextEvent;
-
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContextEvent;
 import java.util.List;
 import java.util.ArrayList;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -69,8 +67,8 @@
 import java.util.UUID;
 import java.util.NoSuchElementException;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
 
 import co.oslc.refimpl.lib.MemResourceRepository;
 import co.oslc.refimpl.lib.ResourceRepository;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/auth/AuthenticationApplication.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/auth/AuthenticationApplication.java
index b3e731da..b75a7e48 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/auth/AuthenticationApplication.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/auth/AuthenticationApplication.java
@@ -22,9 +22,9 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/clients/GenericRequiredAdaptorClient.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/clients/GenericRequiredAdaptorClient.java
index 630ed63a..2ad2426e 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/clients/GenericRequiredAdaptorClient.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/clients/GenericRequiredAdaptorClient.java
@@ -19,7 +19,7 @@
 
 package co.oslc.refimpl.cm.gen.clients;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import org.eclipse.lyo.client.OSLCConstants;
 import org.eclipse.lyo.client.OslcClient;
 import org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/Change_requestsService.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/Change_requestsService.java
index a93f9be1..32af0478 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/Change_requestsService.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/Change_requestsService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ResourceShapeService.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ResourceShapeService.java
index 0902e8e0..eaa6df6c 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ResourceShapeService.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ResourceShapeService.java
@@ -28,20 +28,20 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
@@ -64,7 +64,7 @@ public class ResourceShapeService
     @Context private HttpServletRequest httpServletRequest;
     @Context private HttpServletResponse httpServletResponse;
     @Context private UriInfo uriInfo;
-    @Context private javax.ws.rs.core.Application jaxrsApplication; 
+    @Context private jakarta.ws.rs.core.Application jaxrsApplication; 
 
     private static final Logger log = LoggerFactory.getLogger(ResourceShapeService.class.getName());
 
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/RootServicesService.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/RootServicesService.java
index 6a5100d1..83f3c58e 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/RootServicesService.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/RootServicesService.java
@@ -16,17 +16,17 @@
 
 package co.oslc.refimpl.cm.gen.services;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import co.oslc.refimpl.cm.gen.ServerConstants;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ServiceProviderCatalogService.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ServiceProviderCatalogService.java
index 01727cfb..a8e44c8a 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ServiceProviderCatalogService.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ServiceProviderCatalogService.java
@@ -29,19 +29,19 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.Response;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.Response;
 
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ServiceProviderService.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ServiceProviderService.java
index e70bee2b..94bc2217 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ServiceProviderService.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ServiceProviderService.java
@@ -27,18 +27,18 @@
 
 import java.io.IOException;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response.Status;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/WsChangeRequest.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/WsChangeRequest.java
index 7693564f..420316ea 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/WsChangeRequest.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/WsChangeRequest.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/Application.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/Application.java
index 1827603c..73b274d3 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/Application.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/Application.java
@@ -30,7 +30,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
 
@@ -103,11 +103,11 @@
 // End of user code
 
 /**
- * Generated by Lyo Designer 6.0.0.202310032221
+ * Generated by Lyo Designer 6.0.0.qualifier
  */
 
 @OpenAPIDefinition(info = @Info(title = "CM", version = "1.0.0"), servers = @Server(url = "/services/"))
-public class Application extends javax.ws.rs.core.Application {
+public class Application extends jakarta.ws.rs.core.Application {
 
     private static final Set<Class<?>>         RESOURCE_CLASSES                          = new HashSet<Class<?>>();
     private static final Map<String, Class<?>> RESOURCE_SHAPE_PATH_TO_RESOURCE_CLASS_MAP = new HashMap<String, Class<?>>();
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ApplicationBinder.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ApplicationBinder.java
index ad763800..a003dd32 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ApplicationBinder.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ApplicationBinder.java
@@ -22,7 +22,7 @@
 import org.glassfish.hk2.api.Factory;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import co.oslc.refimpl.cm.gen.RestDelegate;
 import co.oslc.refimpl.cm.gen.ResourcesFactory;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/CredentialsFilter.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/CredentialsFilter.java
index 58190ad9..b59d94f7 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/CredentialsFilter.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/CredentialsFilter.java
@@ -24,15 +24,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import net.oauth.OAuth;
 import net.oauth.OAuthException;
 import net.oauth.OAuthMessage;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/OslcCorsFilter.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/OslcCorsFilter.java
index 2896a558..64e04af3 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/OslcCorsFilter.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/OslcCorsFilter.java
@@ -1,9 +1,9 @@
 package co.oslc.refimpl.cm.gen.servlet;
 
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.ext.Provider;
 import java.io.IOException;
 
 /**
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/OslcCspFilter.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/OslcCspFilter.java
index 70d0a8da..f5614039 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/OslcCspFilter.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/OslcCspFilter.java
@@ -1,9 +1,9 @@
 package co.oslc.refimpl.cm.gen.servlet;
 
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.ext.Provider;
 import java.io.IOException;
 
 /**
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProviderCatalogSingleton.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProviderCatalogSingleton.java
index fafce329..61f83061 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProviderCatalogSingleton.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProviderCatalogSingleton.java
@@ -34,10 +34,10 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.Service;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProvidersFactory.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProvidersFactory.java
index bb2b1099..d7ac7c1b 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProvidersFactory.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProvidersFactory.java
@@ -33,7 +33,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServletListener.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServletListener.java
index 3a007c0b..ac191e21 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServletListener.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServletListener.java
@@ -31,11 +31,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletRegistration;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletRegistration;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import co.oslc.refimpl.cm.gen.RestDelegate;
diff --git a/src/server-cm/src/main/webapp/WEB-INF/web.xml b/src/server-cm/src/main/webapp/WEB-INF/web.xml
index f30c2f17..b9f2b5e6 100644
--- a/src/server-cm/src/main/webapp/WEB-INF/web.xml
+++ b/src/server-cm/src/main/webapp/WEB-INF/web.xml
@@ -32,7 +32,7 @@
         <servlet-name>JAX-RS Servlet</servlet-name>
         <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
         <init-param>
-            <param-name>javax.ws.rs.Application</param-name>
+            <param-name>jakarta.ws.rs.Application</param-name>
             <param-value>co.oslc.refimpl.cm.gen.servlet.Application</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changenoticecreator.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changenoticecreator.jsp
index d750af16..6ba57f28 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changenoticecreator.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changenoticecreator.jsp
@@ -22,7 +22,7 @@
 <%@page import="java.util.List" %>
 <%@page import="org.eclipse.lyo.oslc.domains.cm.ChangeNotice"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changenoticescollection.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changenoticescollection.jsp
index b64c8e80..361149f5 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changenoticescollection.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changenoticescollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changerequestscollection.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changerequestscollection.jsp
index 054238c1..3f607a90 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changerequestscollection.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changerequestscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/creationdialogsampleclient.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/creationdialogsampleclient.jsp
index 5fb106cb..d621ec4c 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/creationdialogsampleclient.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/creationdialogsampleclient.jsp
@@ -16,7 +16,7 @@
  This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
 --%>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/defectcreator.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/defectcreator.jsp
index 7d9ed2cc..6bfbcf83 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/defectcreator.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/defectcreator.jsp
@@ -22,7 +22,7 @@
 <%@page import="java.util.List" %>
 <%@page import="org.eclipse.lyo.oslc.domains.cm.Defect"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/defectscollection.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/defectscollection.jsp
index 94829390..44f85bd5 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/defectscollection.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/defectscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/enhancementcreator.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/enhancementcreator.jsp
index 661e4b9c..2decea87 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/enhancementcreator.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/enhancementcreator.jsp
@@ -22,7 +22,7 @@
 <%@page import="java.util.List" %>
 <%@page import="org.eclipse.lyo.oslc.domains.cm.Enhancement"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/enhancementscollection.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/enhancementscollection.jsp
index 489b4d9c..c23ac846 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/enhancementscollection.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/enhancementscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/resourceshape.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/resourceshape.jsp
index ccec869f..ee139fff 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/resourceshape.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/resourceshape.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.Property"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.OslcConstants"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/reviewtaskcreator.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/reviewtaskcreator.jsp
index 14600ad4..9c9f270d 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/reviewtaskcreator.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/reviewtaskcreator.jsp
@@ -22,7 +22,7 @@
 <%@page import="java.util.List" %>
 <%@page import="org.eclipse.lyo.oslc.domains.cm.ReviewTask"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/reviewtaskscollection.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/reviewtaskscollection.jsp
index b93cf000..f7d0d1bb 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/reviewtaskscollection.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/reviewtaskscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/selectiondialogsampleclient.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/selectiondialogsampleclient.jsp
index 245d1430..728f3248 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/selectiondialogsampleclient.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/selectiondialogsampleclient.jsp
@@ -16,7 +16,7 @@
  This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
 --%>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/serviceprovider.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/serviceprovider.jsp
index 73fc7426..7451a8dc 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/serviceprovider.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/serviceprovider.jsp
@@ -26,7 +26,7 @@
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.CreationFactory" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.QueryCapability" %>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/serviceprovidercatalog.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/serviceprovidercatalog.jsp
index 880592cc..61f7a37b 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/serviceprovidercatalog.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/serviceprovidercatalog.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/taskcreator.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/taskcreator.jsp
index 215dcdac..885d9815 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/taskcreator.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/taskcreator.jsp
@@ -22,7 +22,7 @@
 <%@page import="java.util.List" %>
 <%@page import="org.eclipse.lyo.oslc.domains.cm.Task"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/taskscollection.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/taskscollection.jsp
index eed65f2c..34e363a6 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/taskscollection.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/taskscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/viewresource.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/viewresource.jsp
index 83b28db4..53bf0932 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/viewresource.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/viewresource.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-cm/src/main/webapp/index.jsp b/src/server-cm/src/main/webapp/index.jsp
index 4973d142..cb2785e0 100644
--- a/src/server-cm/src/main/webapp/index.jsp
+++ b/src/server-cm/src/main/webapp/index.jsp
@@ -16,7 +16,7 @@
 --%>
 
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="java.net.URI"%>
 
 <%@ page language="java" contentType="text/html; charset=UTF-8"
diff --git a/src/server-cm/src/main/webapp/swagger-ui/index.jsp b/src/server-cm/src/main/webapp/swagger-ui/index.jsp
index d6c9348c..819280c1 100644
--- a/src/server-cm/src/main/webapp/swagger-ui/index.jsp
+++ b/src/server-cm/src/main/webapp/swagger-ui/index.jsp
@@ -16,7 +16,7 @@
 --%>
 
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="java.net.URI"%>
 <%@page import="java.io.File"%>
 
diff --git a/src/server-cm/tomcat.Dockerfile b/src/server-cm/tomcat.Dockerfile
new file mode 100644
index 00000000..2fd72bed
--- /dev/null
+++ b/src/server-cm/tomcat.Dockerfile
@@ -0,0 +1,7 @@
+FROM docker.io/library/tomcat:10-jre17
+
+# do not write log files, log everything to the Docker daemon
+COPY config/tomcat-log.properties $CATALINA_BASE/conf/logging.properties
+ENV CATALINA_OUT=/dev/null
+
+COPY target/*.war /usr/local/tomcat/webapps/ROOT.war
diff --git a/src/server-qm/.dockerignore b/src/server-qm/.dockerignore
index a093a3de..286ab7bb 100644
--- a/src/server-qm/.dockerignore
+++ b/src/server-qm/.dockerignore
@@ -1,2 +1,4 @@
-**/*
+overlays/
+src/
+target/**/*
 !target/*.war
diff --git a/src/server-qm/Dockerfile b/src/server-qm/Dockerfile
index 8f02ac63..f0f5a4ae 100644
--- a/src/server-qm/Dockerfile
+++ b/src/server-qm/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/jetty:10-jre17
+FROM docker.io/library/jetty:11-jre17
 # WARNING DO NOT CHANGE WORKDIR or set it back to what it was before
 # $JETTY_BASE must be correct before starting Jetty
 
diff --git a/src/server-qm/config/tomcat-log.properties b/src/server-qm/config/tomcat-log.properties
new file mode 100644
index 00000000..5876dc1b
--- /dev/null
+++ b/src/server-qm/config/tomcat-log.properties
@@ -0,0 +1,21 @@
+# Docker log config to make sure Tomcat logs everything to Docker!
+
+handlers = java.util.logging.ConsoleHandler
+
+.handlers = java.util.logging.ConsoleHandler
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.OneLineFormatter
+java.util.logging.ConsoleHandler.encoding = UTF-8
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = \
+   java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = \
+   java.util.logging.ConsoleHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
diff --git a/src/server-qm/pom.xml b/src/server-qm/pom.xml
index 07b9c612..22ad2fed 100644
--- a/src/server-qm/pom.xml
+++ b/src/server-qm/pom.xml
@@ -19,9 +19,9 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.release>17</maven.compiler.release>
-        <version.lyo>6.0.0.Alpha1</version.lyo>
-        <jersey.version>2.35</jersey.version>
-        <swagger.version>2.2.7</swagger.version>
+        <version.lyo>6.0.0-SNAPSHOT</version.lyo>
+        <jersey.version>3.1.5</jersey.version>
+        <swagger.version>2.2.20</swagger.version>
         <swagger-ui.version>3.52.5</swagger-ui.version>
         <servlet.port>8802</servlet.port>
         <application.contextpath>/</application.contextpath>
@@ -48,9 +48,9 @@
         </repository>
         
     </repositories>
-    <!-- Start of user code pre_dependencies
-    -->
     <profiles>
+        <!-- Start of user code profiles
+        -->
       <profile>
         <id>strict</id>
         <build>
@@ -105,7 +105,34 @@
           </plugins>
         </build>
       </profile>
+        <!-- End of user code
+        -->
+        <profile>
+        <!-- some servlet containers (Tomcat) does not ship with a JSTL impl
+        In such cases, run with this profile-->
+            <id>with-jstl-impl</id>
+            <dependencies>
+              <!-- Start of user code profile_dependencies
+              -->
+              <!-- TODO: Add additional dependencies to this profile here to avoid them be overridden upon future re-generation -->
+              <!-- End of user code
+              -->
+              <dependency>
+                  <groupId>jakarta.servlet.jsp.jstl</groupId>
+                  <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+                  <version>3.0.0</version>
+              </dependency>
+              <dependency>
+                  <groupId>org.glassfish.web</groupId>
+                  <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+                  <version>3.0.1</version>
+              </dependency>
+            </dependencies>
+        </profile>
+        
     </profiles>
+    <!-- Start of user code pre_dependencies
+    -->
     <!-- End of user code
     -->
     <dependencies>
@@ -128,22 +155,25 @@
         </dependency>
         <!-- Servlet dependencies -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.servlet.jsp.jstl</groupId>
             <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-            <version>1.2.5</version>
+            <version>3.0.0</version>
+            <!--When running with the jetty-maven-plugin, you 
+            get warnings about jsp classes being scanned from multiple locations.
+            adding the "provided" scope avoids these warnings.-->
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.hk2.external</groupId>
             <artifactId>jakarta.inject</artifactId>
             <version>2.6.1</version>
         </dependency>
-        
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-server</artifactId>
@@ -183,7 +213,7 @@
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
-            <version>4.0.2</version>
+            <version>4.0.5</version>
             <scope>runtime</scope>
         </dependency>
         <!-- Lyo dependencies -->
@@ -232,7 +262,7 @@
         <!-- Swagger dependencies -->
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-jaxrs2</artifactId>
+            <artifactId>swagger-jaxrs2-jakarta</artifactId>
             <version>${swagger.version}</version>
             <exclusions>
                 <exclusion>
@@ -244,7 +274,7 @@
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-jaxrs2-servlet-initializer-v2</artifactId>
+            <artifactId>swagger-jaxrs2-servlet-initializer-v2-jakarta</artifactId>
             <version>${swagger.version}</version>
         </dependency>
         <!-- Start of user code dependencies_final
@@ -268,7 +298,7 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>10.0.7</version>
+                <version>11.0.20</version>
                 <configuration>
                   <webApp>
                     <contextPath>${application.contextpath}</contextPath>
@@ -285,15 +315,13 @@
             <plugin>
                 <groupId>org.codehaus.cargo</groupId>
                 <artifactId>cargo-maven3-plugin</artifactId>
-                <version>1.10.6</version>
+                <version>1.10.12</version>
                 <configuration>
                     <!--This plugins supports the following containers-->
                     <container>
                         <!--These containers are know to work-->
-                        <containerId>tomcat9x</containerId>
-                        <!-- <containerId>jetty10x</containerId> -->
-                        <!-- <containerId>jetty9x</containerId> -->
-                        <!-- <containerId>tomee8x</containerId> -->
+                        <containerId>tomcat10x</containerId>
+                        <containerId>jetty12x</containerId>
                         <!-- <containerId>payara</containerId> -->
                         <!-- <containerId>wildfly26x</containerId> -->
                         <!--These containers are know to fail-->
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/ResourcesFactory.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/ResourcesFactory.java
index 45dd9f89..ba4fcd51 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/ResourcesFactory.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/ResourcesFactory.java
@@ -24,7 +24,7 @@
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.model.Link;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/RestDelegate.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/RestDelegate.java
index 896bcab2..90a21adf 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/RestDelegate.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/RestDelegate.java
@@ -25,9 +25,9 @@
 package co.oslc.refimpl.qm.gen;
 
 
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.ServletContextEvent;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContextEvent;
 import java.util.List;
 import java.util.ArrayList;
 import org.slf4j.Logger;
@@ -68,8 +68,8 @@
 import java.util.Date;
 import java.util.UUID;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
 
 import co.oslc.refimpl.lib.MemResourceRepository;
 import co.oslc.refimpl.lib.ResourceRepository;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/auth/AuthenticationApplication.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/auth/AuthenticationApplication.java
index e85ada78..8eda8c77 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/auth/AuthenticationApplication.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/auth/AuthenticationApplication.java
@@ -22,9 +22,9 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/clients/GenericRequiredAdaptorClient.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/clients/GenericRequiredAdaptorClient.java
index c872fcd2..16af2f7a 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/clients/GenericRequiredAdaptorClient.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/clients/GenericRequiredAdaptorClient.java
@@ -19,7 +19,7 @@
 
 package co.oslc.refimpl.qm.gen.clients;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import org.eclipse.lyo.client.OSLCConstants;
 import org.eclipse.lyo.client.OslcClient;
 import org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/CasesService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/CasesService.java
index 8e8927d7..99ceba65 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/CasesService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/CasesService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/Execution_recordsService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/Execution_recordsService.java
index 3b5619d3..afd90b8e 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/Execution_recordsService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/Execution_recordsService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/PlansService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/PlansService.java
index 6e1c1f34..c4712eaf 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/PlansService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/PlansService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ResourceShapeService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ResourceShapeService.java
index 88afbbea..bbd14a13 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ResourceShapeService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ResourceShapeService.java
@@ -28,20 +28,20 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
@@ -64,7 +64,7 @@ public class ResourceShapeService
     @Context private HttpServletRequest httpServletRequest;
     @Context private HttpServletResponse httpServletResponse;
     @Context private UriInfo uriInfo;
-    @Context private javax.ws.rs.core.Application jaxrsApplication; 
+    @Context private jakarta.ws.rs.core.Application jaxrsApplication; 
 
     private static final Logger log = LoggerFactory.getLogger(ResourceShapeService.class.getName());
 
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ResultsService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ResultsService.java
index 97957bf4..af402e0c 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ResultsService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ResultsService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/RootServicesService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/RootServicesService.java
index 318d4c21..f7086d9d 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/RootServicesService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/RootServicesService.java
@@ -16,17 +16,17 @@
 
 package co.oslc.refimpl.qm.gen.services;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import co.oslc.refimpl.qm.gen.ServerConstants;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ScriptsService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ScriptsService.java
index 2e96ba89..6fcf432d 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ScriptsService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ScriptsService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ServiceProviderCatalogService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ServiceProviderCatalogService.java
index 17d690d4..1b48cc83 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ServiceProviderCatalogService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ServiceProviderCatalogService.java
@@ -29,19 +29,19 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.Response;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.Response;
 
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ServiceProviderService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ServiceProviderService.java
index d9c1fa74..76347d76 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ServiceProviderService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ServiceProviderService.java
@@ -27,18 +27,18 @@
 
 import java.io.IOException;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response.Status;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsCases.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsCases.java
index 5c93c8d7..24591329 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsCases.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsCases.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsExecRecords.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsExecRecords.java
index 3ee12527..c6e130d7 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsExecRecords.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsExecRecords.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsPlans.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsPlans.java
index b0f8f4c0..0b101667 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsPlans.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsPlans.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsResults.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsResults.java
index 5546f42f..9277343d 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsResults.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsResults.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsScripts.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsScripts.java
index 891f1d1d..6baded87 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsScripts.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsScripts.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java
index d84587de..7f08a945 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java
@@ -30,7 +30,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
 
@@ -115,11 +115,11 @@
 // End of user code
 
 /**
- * Generated by Lyo Designer 6.0.0.202310032221
+ * Generated by Lyo Designer 6.0.0.qualifier
  */
 
 @OpenAPIDefinition(info = @Info(title = "QM", version = "1.0.0"), servers = @Server(url = "/services/"))
-public class Application extends javax.ws.rs.core.Application {
+public class Application extends jakarta.ws.rs.core.Application {
 
     private static final Set<Class<?>>         RESOURCE_CLASSES                          = new HashSet<Class<?>>();
     private static final Map<String, Class<?>> RESOURCE_SHAPE_PATH_TO_RESOURCE_CLASS_MAP = new HashMap<String, Class<?>>();
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ApplicationBinder.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ApplicationBinder.java
index e8f4d2b3..900e606a 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ApplicationBinder.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ApplicationBinder.java
@@ -22,7 +22,7 @@
 import org.glassfish.hk2.api.Factory;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import co.oslc.refimpl.qm.gen.RestDelegate;
 import co.oslc.refimpl.qm.gen.ResourcesFactory;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/CredentialsFilter.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/CredentialsFilter.java
index 1377b034..a61657d8 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/CredentialsFilter.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/CredentialsFilter.java
@@ -24,15 +24,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import net.oauth.OAuth;
 import net.oauth.OAuthException;
 import net.oauth.OAuthMessage;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProviderCatalogSingleton.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProviderCatalogSingleton.java
index 0165ad99..09470e97 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProviderCatalogSingleton.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProviderCatalogSingleton.java
@@ -34,10 +34,10 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.Service;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProvidersFactory.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProvidersFactory.java
index e82d5e73..c1aa3426 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProvidersFactory.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProvidersFactory.java
@@ -33,7 +33,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServletListener.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServletListener.java
index be822943..4cd90295 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServletListener.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServletListener.java
@@ -31,11 +31,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletRegistration;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletRegistration;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import co.oslc.refimpl.qm.gen.RestDelegate;
diff --git a/src/server-qm/src/main/webapp/WEB-INF/web.xml b/src/server-qm/src/main/webapp/WEB-INF/web.xml
index 8d178cd5..d6823ced 100644
--- a/src/server-qm/src/main/webapp/WEB-INF/web.xml
+++ b/src/server-qm/src/main/webapp/WEB-INF/web.xml
@@ -32,7 +32,7 @@
         <servlet-name>JAX-RS Servlet</servlet-name>
         <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
         <init-param>
-            <param-name>javax.ws.rs.Application</param-name>
+            <param-name>jakarta.ws.rs.Application</param-name>
             <param-value>co.oslc.refimpl.qm.gen.servlet.Application</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/creationdialogsampleclient.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/creationdialogsampleclient.jsp
index 5fb106cb..d621ec4c 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/creationdialogsampleclient.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/creationdialogsampleclient.jsp
@@ -16,7 +16,7 @@
  This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
 --%>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/resourceshape.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/resourceshape.jsp
index ccec869f..ee139fff 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/resourceshape.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/resourceshape.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.Property"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.OslcConstants"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/selectiondialogsampleclient.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/selectiondialogsampleclient.jsp
index 245d1430..728f3248 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/selectiondialogsampleclient.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/selectiondialogsampleclient.jsp
@@ -16,7 +16,7 @@
  This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
 --%>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/serviceprovider.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/serviceprovider.jsp
index 1be8869e..20556da2 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/serviceprovider.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/serviceprovider.jsp
@@ -26,7 +26,7 @@
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.CreationFactory" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.QueryCapability" %>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/serviceprovidercatalog.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/serviceprovidercatalog.jsp
index b347f905..e6f01ab4 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/serviceprovidercatalog.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/serviceprovidercatalog.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcase.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcase.jsp
index 31576c7a..f93f3d3d 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcase.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcase.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestCase"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcaselargepreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcaselargepreview.jsp
index e40e4467..f15931d6 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcaselargepreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcaselargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestCase"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcasescollection.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcasescollection.jsp
index 4edb70a5..c41104d1 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcasescollection.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcasescollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcaseselector.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcaseselector.jsp
index 15a1b8c6..dc21a6ec 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcaseselector.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcaseselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestCase"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcasesmallpreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcasesmallpreview.jsp
index c4ded6f4..c7d98adf 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcasesmallpreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcasesmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestCase"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecord.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecord.jsp
index f6f942ba..a5fcbb66 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecord.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecord.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestExecutionRecord"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordlargepreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordlargepreview.jsp
index e7d92da2..af959d66 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordlargepreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordlargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestExecutionRecord"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordscollection.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordscollection.jsp
index 6c343f69..370e3458 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordscollection.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordselector.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordselector.jsp
index 1b996e6c..db3a126a 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordselector.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestExecutionRecord"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordsmallpreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordsmallpreview.jsp
index 32e726d8..aba82235 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordsmallpreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordsmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestExecutionRecord"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplan.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplan.jsp
index e6e2f753..ced22185 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplan.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplan.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestPlan"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanlargepreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanlargepreview.jsp
index a7dfc06c..9d43ea68 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanlargepreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanlargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestPlan"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanscollection.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanscollection.jsp
index 80c76840..55172946 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanscollection.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanselector.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanselector.jsp
index eefbb8a9..05b90d61 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanselector.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestPlan"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplansmallpreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplansmallpreview.jsp
index a1c8c886..ec8d82f1 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplansmallpreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplansmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestPlan"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresult.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresult.jsp
index ad76e69a..7925aad6 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresult.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresult.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestResult"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultlargepreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultlargepreview.jsp
index 40657b6a..f3e72ef2 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultlargepreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultlargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestResult"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultscollection.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultscollection.jsp
index a1daaec8..05de1f62 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultscollection.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultselector.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultselector.jsp
index 22fc28b8..3ff3125d 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultselector.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestResult"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultsmallpreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultsmallpreview.jsp
index 683108aa..a61e9f18 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultsmallpreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultsmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestResult"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscript.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscript.jsp
index f1c63a0a..b3daf408 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscript.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscript.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestScript"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptlargepreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptlargepreview.jsp
index dbf83bea..0d81a854 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptlargepreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptlargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestScript"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptscollection.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptscollection.jsp
index 380c6fa0..a274eb2a 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptscollection.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptselector.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptselector.jsp
index 3d303ea5..984bf328 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptselector.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestScript"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptsmallpreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptsmallpreview.jsp
index 558be6d2..3bbcadb1 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptsmallpreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptsmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestScript"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/index.jsp b/src/server-qm/src/main/webapp/index.jsp
index 5974ba80..03172990 100644
--- a/src/server-qm/src/main/webapp/index.jsp
+++ b/src/server-qm/src/main/webapp/index.jsp
@@ -16,7 +16,7 @@
 --%>
 
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="java.net.URI"%>
 
 <%@ page language="java" contentType="text/html; charset=UTF-8"
diff --git a/src/server-qm/src/main/webapp/swagger-ui/index.jsp b/src/server-qm/src/main/webapp/swagger-ui/index.jsp
index d6c9348c..819280c1 100644
--- a/src/server-qm/src/main/webapp/swagger-ui/index.jsp
+++ b/src/server-qm/src/main/webapp/swagger-ui/index.jsp
@@ -16,7 +16,7 @@
 --%>
 
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="java.net.URI"%>
 <%@page import="java.io.File"%>
 
diff --git a/src/server-qm/tomcat.Dockerfile b/src/server-qm/tomcat.Dockerfile
new file mode 100644
index 00000000..2fd72bed
--- /dev/null
+++ b/src/server-qm/tomcat.Dockerfile
@@ -0,0 +1,7 @@
+FROM docker.io/library/tomcat:10-jre17
+
+# do not write log files, log everything to the Docker daemon
+COPY config/tomcat-log.properties $CATALINA_BASE/conf/logging.properties
+ENV CATALINA_OUT=/dev/null
+
+COPY target/*.war /usr/local/tomcat/webapps/ROOT.war
diff --git a/src/server-rm/Dockerfile b/src/server-rm/Dockerfile
index 8f02ac63..f0f5a4ae 100644
--- a/src/server-rm/Dockerfile
+++ b/src/server-rm/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/jetty:10-jre17
+FROM docker.io/library/jetty:11-jre17
 # WARNING DO NOT CHANGE WORKDIR or set it back to what it was before
 # $JETTY_BASE must be correct before starting Jetty
 
diff --git a/src/server-rm/pom.xml b/src/server-rm/pom.xml
index 997d94db..73f5ffc2 100644
--- a/src/server-rm/pom.xml
+++ b/src/server-rm/pom.xml
@@ -19,9 +19,9 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.release>17</maven.compiler.release>
-        <version.lyo>6.0.0.Alpha1</version.lyo>
-        <jersey.version>2.35</jersey.version>
-        <swagger.version>2.2.7</swagger.version>
+        <version.lyo>6.0.0-SNAPSHOT</version.lyo>
+        <jersey.version>3.1.5</jersey.version>
+        <swagger.version>2.2.20</swagger.version>
         <swagger-ui.version>3.52.5</swagger-ui.version>
         <servlet.port>8800</servlet.port>
         <application.contextpath>/</application.contextpath>
@@ -49,9 +49,9 @@
         </repository>
         
     </repositories>
-    <!-- Start of user code pre_dependencies
-    -->
     <profiles>
+        <!-- Start of user code profiles
+        -->
         <profile>
             <id>strict</id>
             <build>
@@ -106,7 +106,34 @@
             </plugins>
             </build>
         </profile>
+        <!-- End of user code
+        -->
+        <profile>
+        <!-- some servlet containers (Tomcat) does not ship with a JSTL impl
+        In such cases, run with this profile-->
+            <id>with-jstl-impl</id>
+            <dependencies>
+              <!-- Start of user code profile_dependencies
+              -->
+              <!-- TODO: Add additional dependencies to this profile here to avoid them be overridden upon future re-generation -->
+              <!-- End of user code
+              -->
+              <dependency>
+                  <groupId>jakarta.servlet.jsp.jstl</groupId>
+                  <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+                  <version>3.0.0</version>
+              </dependency>
+              <dependency>
+                  <groupId>org.glassfish.web</groupId>
+                  <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+                  <version>3.0.1</version>
+              </dependency>
+            </dependencies>
+        </profile>
+        
     </profiles>
+    <!-- Start of user code pre_dependencies
+    -->
     <!-- End of user code
     -->
     <dependencies>
@@ -140,22 +167,25 @@
         </dependency>
         <!-- Servlet dependencies -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.servlet.jsp.jstl</groupId>
             <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-            <version>1.2.5</version>
+            <version>3.0.0</version>
+            <!--When running with the jetty-maven-plugin, you 
+            get warnings about jsp classes being scanned from multiple locations.
+            adding the "provided" scope avoids these warnings.-->
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.hk2.external</groupId>
             <artifactId>jakarta.inject</artifactId>
             <version>2.6.1</version>
         </dependency>
-        
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-server</artifactId>
@@ -195,7 +225,7 @@
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
-            <version>4.0.2</version>
+            <version>4.0.5</version>
             <scope>runtime</scope>
         </dependency>
         <!-- Lyo dependencies -->
@@ -244,7 +274,7 @@
         <!-- Swagger dependencies -->
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-jaxrs2</artifactId>
+            <artifactId>swagger-jaxrs2-jakarta</artifactId>
             <version>${swagger.version}</version>
             <exclusions>
                 <exclusion>
@@ -256,7 +286,7 @@
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-jaxrs2-servlet-initializer-v2</artifactId>
+            <artifactId>swagger-jaxrs2-servlet-initializer-v2-jakarta</artifactId>
             <version>${swagger.version}</version>
         </dependency>
         <!-- Start of user code dependencies_final
@@ -294,7 +324,7 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>10.0.7</version>
+                <version>11.0.20</version>
                 <configuration>
                   <webApp>
                     <contextPath>${application.contextpath}</contextPath>
@@ -311,15 +341,13 @@
             <plugin>
                 <groupId>org.codehaus.cargo</groupId>
                 <artifactId>cargo-maven3-plugin</artifactId>
-                <version>1.10.6</version>
+                <version>1.10.12</version>
                 <configuration>
                     <!--This plugins supports the following containers-->
                     <container>
                         <!--These containers are know to work-->
-                        <containerId>tomcat9x</containerId>
-                        <!-- <containerId>jetty10x</containerId> -->
-                        <!-- <containerId>jetty9x</containerId> -->
-                        <!-- <containerId>tomee8x</containerId> -->
+                        <containerId>tomcat10x</containerId>
+                        <containerId>jetty12x</containerId>
                         <!-- <containerId>payara</containerId> -->
                         <!-- <containerId>wildfly26x</containerId> -->
                         <!--These containers are know to fail-->
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/ResourcesFactory.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/ResourcesFactory.java
index 18cae8c9..f05e3895 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/ResourcesFactory.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/ResourcesFactory.java
@@ -24,7 +24,7 @@
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.model.Link;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/RestDelegate.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/RestDelegate.java
index f07b4c37..efd5122a 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/RestDelegate.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/RestDelegate.java
@@ -25,9 +25,9 @@
 package co.oslc.refimpl.rm.gen;
 
 
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.ServletContextEvent;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContextEvent;
 import java.util.List;
 import java.util.ArrayList;
 import org.slf4j.Logger;
@@ -57,8 +57,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/auth/AuthenticationApplication.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/auth/AuthenticationApplication.java
index 7e862b63..a07c2436 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/auth/AuthenticationApplication.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/auth/AuthenticationApplication.java
@@ -22,9 +22,9 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/clients/GenericRequiredAdaptorClient.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/clients/GenericRequiredAdaptorClient.java
index 3dc171d8..3ef86228 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/clients/GenericRequiredAdaptorClient.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/clients/GenericRequiredAdaptorClient.java
@@ -19,7 +19,7 @@
 
 package co.oslc.refimpl.rm.gen.clients;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import org.eclipse.lyo.client.OSLCConstants;
 import org.eclipse.lyo.client.OslcClient;
 import org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/Requirement_collectionsService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/Requirement_collectionsService.java
index c3838f5e..dfb566ac 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/Requirement_collectionsService.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/Requirement_collectionsService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RequirementsService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RequirementsService.java
index f5243b42..0317eed9 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RequirementsService.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RequirementsService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ResourceShapeService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ResourceShapeService.java
index aac16dbd..f0935af0 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ResourceShapeService.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ResourceShapeService.java
@@ -28,20 +28,20 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
@@ -64,7 +64,7 @@ public class ResourceShapeService
     @Context private HttpServletRequest httpServletRequest;
     @Context private HttpServletResponse httpServletResponse;
     @Context private UriInfo uriInfo;
-    @Context private javax.ws.rs.core.Application jaxrsApplication; 
+    @Context private jakarta.ws.rs.core.Application jaxrsApplication; 
 
     private static final Logger log = LoggerFactory.getLogger(ResourceShapeService.class.getName());
 
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RootServicesService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RootServicesService.java
index 92c00f7d..951b7191 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RootServicesService.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RootServicesService.java
@@ -16,17 +16,17 @@
 
 package co.oslc.refimpl.rm.gen.services;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import co.oslc.refimpl.rm.gen.ServerConstants;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderCatalogService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderCatalogService.java
index ebdee6e2..acebe181 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderCatalogService.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderCatalogService.java
@@ -29,19 +29,19 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.Response;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.Response;
 
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderService.java
index d2b6f417..3bf800be 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderService.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderService.java
@@ -27,18 +27,18 @@
 
 import java.io.IOException;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response.Status;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/WebServiceBasic.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/WebServiceBasic.java
index f7211956..805c444f 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/WebServiceBasic.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/WebServiceBasic.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java
index 6f479020..df9c2121 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java
@@ -30,7 +30,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
 
@@ -84,11 +84,11 @@
 // End of user code
 
 /**
- * Generated by Lyo Designer 6.0.0.202310032221
+ * Generated by Lyo Designer 6.0.0.qualifier
  */
 
 @OpenAPIDefinition(info = @Info(title = "RM", version = "1.0.0"), servers = @Server(url = "/services/"))
-public class Application extends javax.ws.rs.core.Application {
+public class Application extends jakarta.ws.rs.core.Application {
 
     private static final Set<Class<?>>         RESOURCE_CLASSES                          = new HashSet<Class<?>>();
     private static final Map<String, Class<?>> RESOURCE_SHAPE_PATH_TO_RESOURCE_CLASS_MAP = new HashMap<String, Class<?>>();
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ApplicationBinder.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ApplicationBinder.java
index 40e7bbfd..800c77ef 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ApplicationBinder.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ApplicationBinder.java
@@ -22,7 +22,7 @@
 import org.glassfish.hk2.api.Factory;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import co.oslc.refimpl.rm.gen.RestDelegate;
 import co.oslc.refimpl.rm.gen.ResourcesFactory;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/CredentialsFilter.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/CredentialsFilter.java
index 8fef7ea4..04b19e7e 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/CredentialsFilter.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/CredentialsFilter.java
@@ -24,15 +24,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import net.oauth.OAuth;
 import net.oauth.OAuthException;
 import net.oauth.OAuthMessage;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProviderCatalogSingleton.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProviderCatalogSingleton.java
index 5a37a471..438b7fff 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProviderCatalogSingleton.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProviderCatalogSingleton.java
@@ -34,10 +34,10 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.Service;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProvidersFactory.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProvidersFactory.java
index e9355582..211d6f79 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProvidersFactory.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProvidersFactory.java
@@ -33,7 +33,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServletListener.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServletListener.java
index 7d754c81..e0cdc6e3 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServletListener.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServletListener.java
@@ -31,11 +31,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletRegistration;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletRegistration;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import co.oslc.refimpl.rm.gen.RestDelegate;
diff --git a/src/server-rm/src/main/webapp/WEB-INF/web.xml b/src/server-rm/src/main/webapp/WEB-INF/web.xml
index 77903237..f0738b73 100644
--- a/src/server-rm/src/main/webapp/WEB-INF/web.xml
+++ b/src/server-rm/src/main/webapp/WEB-INF/web.xml
@@ -32,7 +32,7 @@
         <servlet-name>JAX-RS Servlet</servlet-name>
         <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
         <init-param>
-            <param-name>javax.ws.rs.Application</param-name>
+            <param-name>jakarta.ws.rs.Application</param-name>
             <param-value>co.oslc.refimpl.rm.gen.servlet.Application</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/creationdialogsampleclient.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/creationdialogsampleclient.jsp
index 5fb106cb..d621ec4c 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/creationdialogsampleclient.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/creationdialogsampleclient.jsp
@@ -16,7 +16,7 @@
  This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
 --%>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirement.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirement.jsp
index 93e6d246..d729a43c 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirement.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirement.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Requirement"%>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollection.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollection.jsp
index e81ab501..ad35134b 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollection.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollection.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.rm.RequirementCollection"%>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionlargepreview.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionlargepreview.jsp
index 139bfb4c..bc19a223 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionlargepreview.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionlargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.rm.RequirementCollection"%>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionscollection.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionscollection.jsp
index 7f5be65e..4eb96318 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionscollection.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionselector.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionselector.jsp
index 7733b298..cdc7e8ba 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionselector.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.RequirementCollection"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionsmallpreview.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionsmallpreview.jsp
index 5b9e807c..15174d2b 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionsmallpreview.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionsmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.rm.RequirementCollection"%>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcreator.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcreator.jsp
index f79aa84a..c4978ba5 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcreator.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcreator.jsp
@@ -22,7 +22,7 @@
 <%@page import="java.util.List" %>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Requirement"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementlargepreview.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementlargepreview.jsp
index a7c8c4fd..6b720e5a 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementlargepreview.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementlargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Requirement"%>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementscollection.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementscollection.jsp
index 652cd7d2..6022a00e 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementscollection.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementselector.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementselector.jsp
index 203f1fba..de4561a9 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementselector.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Requirement"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementsmallpreview.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementsmallpreview.jsp
index 91794441..6aeed330 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementsmallpreview.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementsmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Requirement"%>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/resourceshape.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/resourceshape.jsp
index ccec869f..ee139fff 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/resourceshape.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/resourceshape.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.Property"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.OslcConstants"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/selectiondialogsampleclient.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/selectiondialogsampleclient.jsp
index 245d1430..728f3248 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/selectiondialogsampleclient.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/selectiondialogsampleclient.jsp
@@ -16,7 +16,7 @@
  This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
 --%>
 
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovider.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovider.jsp
index b1f52c54..d04e0664 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovider.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovider.jsp
@@ -26,7 +26,7 @@
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.CreationFactory" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.QueryCapability" %>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovidercatalog.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovidercatalog.jsp
index 0c167a01..c7960188 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovidercatalog.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovidercatalog.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-rm/src/main/webapp/index.jsp b/src/server-rm/src/main/webapp/index.jsp
index 02b0ad18..0569bc11 100644
--- a/src/server-rm/src/main/webapp/index.jsp
+++ b/src/server-rm/src/main/webapp/index.jsp
@@ -16,7 +16,7 @@
 --%>
 
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="java.net.URI"%>
 
 <%@ page language="java" contentType="text/html; charset=UTF-8"
diff --git a/src/server-rm/src/main/webapp/swagger-ui/index.jsp b/src/server-rm/src/main/webapp/swagger-ui/index.jsp
index d6c9348c..819280c1 100644
--- a/src/server-rm/src/main/webapp/swagger-ui/index.jsp
+++ b/src/server-rm/src/main/webapp/swagger-ui/index.jsp
@@ -16,7 +16,7 @@
 --%>
 
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="javax.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="java.net.URI"%>
 <%@page import="java.io.File"%>
 
diff --git a/src/server-rm/tomcat.Dockerfile b/src/server-rm/tomcat.Dockerfile
index 6505d6cc..2fd72bed 100644
--- a/src/server-rm/tomcat.Dockerfile
+++ b/src/server-rm/tomcat.Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/tomcat:9-jre17
+FROM docker.io/library/tomcat:10-jre17
 
 # do not write log files, log everything to the Docker daemon
 COPY config/tomcat-log.properties $CATALINA_BASE/conf/logging.properties