diff --git a/inception/inception-curation/pom.xml b/inception/inception-curation/pom.xml
index bbaa8c8cbe2..e1650ee98cb 100644
--- a/inception/inception-curation/pom.xml
+++ b/inception/inception-curation/pom.xml
@@ -136,6 +136,10 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.hibernate.orm</groupId>
       <artifactId>hibernate-core</artifactId>
diff --git a/inception/inception-dependencies/pom.xml b/inception/inception-dependencies/pom.xml
index 8c6621ad849..f6c0d9d1a49 100644
--- a/inception/inception-dependencies/pom.xml
+++ b/inception/inception-dependencies/pom.xml
@@ -113,6 +113,12 @@
         </exclusions>
       </dependency>
 
+      <dependency>
+        <groupId>jakarta.data</groupId>
+        <artifactId>jakarta.data-api</artifactId>
+        <version>1.0.0</version>
+      </dependency>
+
       <!-- Testing -->
       <dependency>
         <groupId>org.junit</groupId>
diff --git a/inception/inception-external-search-core/pom.xml b/inception/inception-external-search-core/pom.xml
index 904d369b3ac..e0f6a423414 100644
--- a/inception/inception-external-search-core/pom.xml
+++ b/inception/inception-external-search-core/pom.xml
@@ -93,6 +93,10 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/inception/inception-imls-elg/pom.xml b/inception/inception-imls-elg/pom.xml
index a53866e1956..efb25c415ad 100644
--- a/inception/inception-imls-elg/pom.xml
+++ b/inception/inception-imls-elg/pom.xml
@@ -110,6 +110,10 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
     
      <!-- LOGGING DEPENDENCIES - SLF4J -->
     <dependency>
diff --git a/inception/inception-imls-stringmatch/pom.xml b/inception/inception-imls-stringmatch/pom.xml
index 16983ae968e..02c6a125dac 100644
--- a/inception/inception-imls-stringmatch/pom.xml
+++ b/inception/inception-imls-stringmatch/pom.xml
@@ -138,6 +138,10 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
diff --git a/inception/inception-imls-weblicht/pom.xml b/inception/inception-imls-weblicht/pom.xml
index e6c5d6258d5..7546caefafb 100644
--- a/inception/inception-imls-weblicht/pom.xml
+++ b/inception/inception-imls-weblicht/pom.xml
@@ -173,6 +173,10 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
     
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
diff --git a/inception/inception-log/pom.xml b/inception/inception-log/pom.xml
index a016780a56a..bd0983a6436 100644
--- a/inception/inception-log/pom.xml
+++ b/inception/inception-log/pom.xml
@@ -139,6 +139,10 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
diff --git a/inception/inception-model/pom.xml b/inception/inception-model/pom.xml
index a740999d3b6..777fd356dbb 100644
--- a/inception/inception-model/pom.xml
+++ b/inception/inception-model/pom.xml
@@ -58,5 +58,9 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/inception/inception-security/pom.xml b/inception/inception-security/pom.xml
index 09a4c336ef6..aa250aa074c 100644
--- a/inception/inception-security/pom.xml
+++ b/inception/inception-security/pom.xml
@@ -147,6 +147,10 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.hibernate.orm</groupId>
       <artifactId>hibernate-core</artifactId>
diff --git a/inception/inception-sharing/pom.xml b/inception/inception-sharing/pom.xml
index d0a7e7c0e57..0cfa2375b87 100644
--- a/inception/inception-sharing/pom.xml
+++ b/inception/inception-sharing/pom.xml
@@ -71,6 +71,10 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.hibernate.orm</groupId>
       <artifactId>hibernate-core</artifactId>
diff --git a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/extensionpoint/ExtensionPoint_ImplBase.java b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/extensionpoint/ExtensionPoint_ImplBase.java
index 0f6f3211f14..3c2a8164665 100644
--- a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/extensionpoint/ExtensionPoint_ImplBase.java
+++ b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/extensionpoint/ExtensionPoint_ImplBase.java
@@ -74,10 +74,10 @@ public void init()
         extensionsList = unmodifiableList(extensions);
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     protected Comparator<E> makeComparator()
     {
-        return (Comparator<E>) AnnotationAwareOrderComparator.INSTANCE;
+        return (Comparator) AnnotationAwareOrderComparator.INSTANCE;
     }
 
     @Override
diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/LegacyCurationPageMenuItem.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/LegacyCurationPageMenuItem.java
index edbe8b95b62..eda4895146a 100644
--- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/LegacyCurationPageMenuItem.java
+++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/LegacyCurationPageMenuItem.java
@@ -20,8 +20,6 @@
 import static de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel.CURATOR;
 import static java.lang.String.format;
 
-import javax.servlet.ServletContext;
-
 import org.apache.wicket.Page;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.core.annotation.Order;
@@ -33,6 +31,7 @@
 import de.tudarmstadt.ukp.clarin.webanno.security.model.User;
 import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.ProjectMenuItem;
 import de.tudarmstadt.ukp.inception.project.api.ProjectService;
+import jakarta.servlet.ServletContext;
 import wicket.contrib.input.events.key.KeyType;
 
 @ConditionalOnWebApplication
diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/config/CurationUIAutoConfiguration.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/config/CurationUIAutoConfiguration.java
index 9dbddf53994..c8e14f50577 100644
--- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/config/CurationUIAutoConfiguration.java
+++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/config/CurationUIAutoConfiguration.java
@@ -17,8 +17,6 @@
  */
 package de.tudarmstadt.ukp.inception.ui.curation.config;
 
-import javax.servlet.ServletContext;
-
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
@@ -27,6 +25,7 @@
 import de.tudarmstadt.ukp.clarin.webanno.security.UserDao;
 import de.tudarmstadt.ukp.inception.project.api.ProjectService;
 import de.tudarmstadt.ukp.inception.ui.curation.page.CurationPageMenuItem;
+import jakarta.servlet.ServletContext;
 
 @ConditionalOnWebApplication
 @Configuration
diff --git a/inception/inception-workload/pom.xml b/inception/inception-workload/pom.xml
index b85a8b8c445..366ae8399de 100644
--- a/inception/inception-workload/pom.xml
+++ b/inception/inception-workload/pom.xml
@@ -85,7 +85,11 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
-    
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
+  
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>